1. 15 Oct, 2007 32 commits
  2. 14 Oct, 2007 8 commits
    • David Brownell's avatar
      Fix compile while compiling drivers/mmc/host/mmc_spi.o with !BLOCK · 23fd5045
      David Brownell authored
      Make sure the mmc_spi driver can build without CONFIG_BLOCK.
      Issue noted by "Avuton Olrich" <avuton@gmail.com> and randconfig.
      
      While that won't be a common configuration, sometimes embedded
      boards use SDIO to interface WLAN or Bluetooth chips (vs some
      parallel interface), and don't provide an MMC/SD socket for use
      with flash memory cards.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      23fd5045
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 · 59d66ce2
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86:
        x86: force timer broadcast on late AMD C1E detection
        x86: move local APIC timer init to the end of start_secondary()
        clockevents: introduce force broadcast notifier
        x86: fix missing include for vsyscall
      59d66ce2
    • Stephen Hemminger's avatar
      sky2: reboot fix · 5c0d6b34
      Stephen Hemminger authored
      The call to napi_disable() in the PCI shutdown handler is problematic,
      and is aggravated by the new NAPI.
      Also, make sure watchdog timer doesn't go off.
      Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5c0d6b34
    • Thomas Gleixner's avatar
      x86: force timer broadcast on late AMD C1E detection · 89039b37
      Thomas Gleixner authored
      The 64bit SMP bootup is slightly different to the 32bit one. It enables
      the boot CPU local APIC timer before all CPUs are brought up. Some AMD C1E
      systems have the C1E feature flag only set in the secondary CPU. Due to
      the early enable of the boot CPU local APIC timer the APIC timer is
      registered as a fully functional device. When we detect the wreckage during
      the bringup of the secondary CPU, we need to force the boot CPU into
      broadcast mode. 
      
      Check the C1E caused APIC timer disable, when the secondary APIC timer is
      initialized. If the boot CPU APIC timer was registered as a functional
      clock event device, then fix this up and utilize the
      CLOCK_EVT_NOTIFY_BROADCAST_FORCE mechanism to force the already
      registered boot CPU APIC timer into broadcast mode.
      
      Tested by force injecting the failure mode.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      89039b37
    • Thomas Gleixner's avatar
      x86: move local APIC timer init to the end of start_secondary() · 3ac508be
      Thomas Gleixner authored
      Preparatory patch for the AMD C1E wreckage fixup.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      3ac508be
    • Thomas Gleixner's avatar
      clockevents: introduce force broadcast notifier · 1595f452
      Thomas Gleixner authored
      The 64bit SMP bootup is slightly different to the 32bit one. It enables
      the boot CPU local APIC timer before all CPUs are brought up. Some AMD C1E
      systems have the C1E feature flag only set in the secondary CPU. Due to
      the early enable of the boot CPU local APIC timer the APIC timer is
      registered as a fully functional device. When we detect the wreckage during
      the bringup of the secondary CPU, we need to force the boot CPU into
      broadcast mode. 
      
      Add a new notifier reason and implement the force broadcast in the clock
      events layer.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      1595f452
    • Dave Jones's avatar
      x86: fix missing include for vsyscall · b097976e
      Dave Jones authored
       > Maybe I just picked a bad time to try, but...
       > 
       > arch/x86/kernel/alternative.c: In function 'apply_alternatives':
       > arch/x86/kernel/alternative.c:191: error: 'VSYSCALL_START' undeclared (first use in this function)
       > arch/x86/kernel/alternative.c:191: error: (Each undeclared identifier is reported only once
       > arch/x86/kernel/alternative.c:191: error: for each function it appears in.)
       > arch/x86/kernel/alternative.c:191: error: 'VSYSCALL_END' undeclared (first use in this function)
       > make[1]: *** [arch/x86/kernel/alternative.o] Error 1
       > make: *** [arch/x86/kernel] Error 2
      
      Try this.
      
      Include missing header for vsyscall.
      Signed-off-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      b097976e
    • Linus Torvalds's avatar
      Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 · 4fa43501
      Linus Torvalds authored
      * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (53 commits)
        hwmon: (vt8231) fix sparse warning
        hwmon: (sis5595) fix sparse warning
        hwmon: (w83627hf) don't assume bank 0
        hwmon: (w83627hf) Fix setting fan min right after driver load
        hwmon: (w83627hf) De-macro sysfs callback functions
        hwmon: Add new combined driver for FSC chips
        hwmon: (ibmpex) Release IPMI user if hwmon registration fails
        hwmon: (dme1737) Add sch311x support
        hwmon: (dme1737) group functions logically
        hwmon: (dme1737) cleanups
        hwmon: IBM power meter driver
        hwmon: (coretemp) Add support for Celeron 4xx
        hwmon: (lm87) Disable VID when it should be
        hwmon: (w83781d) Add individual alarm and beep files
        hwmon: VRM is not read from registers
        MAINTAINERS: update hwmon subsystem git trees
        hwmon: Fix the code examples in documentation
        hwmon: update sysfs interface document - error handling
        hwmon: (thmc50) Fix a debug message
        hwmon: (thmc50) Don't create temp3 if not enabled
        ...
      4fa43501