1. 01 Aug, 2007 8 commits
    • Paul Mundt's avatar
      sh: Don't include fault-nommu on SH-2/SH-2A. · 56c74c73
      Paul Mundt authored
      fault-nommu defines the page fault handler stubs for SH-3/4 parts,
      but is not needed on SH-2/SH-2A now that the entry code has been
      logically separated.
      
      Add it in for SH-3 and SH-4 explicitly.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      56c74c73
    • Paul Mundt's avatar
      sh: Fix irqflags tracing for SH-3/4 nommu. · c7179943
      Paul Mundt authored
      We were missing the trace_hardirqs_on() instrumentation in the nommu
      case, resync with the MMU version of the page fault handler to have
      this behaving consistently. Also explicitly re-enable IRQs now that
      the assembly code isn't doing it for us any more.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      c7179943
    • Paul Mundt's avatar
      sh: Fix lockdep debugging oops on SH-3/4. · c347d12c
      Paul Mundt authored
      In the SH-3/4 TLB access violation path we were enabling IRQs before
      the call in to trace_hardirqs_on(), which ended up triggering:
      
              if (DEBUG_LOCKS_WARN_ON(!irqs_disabled()))
                      return;
      
      in kernel/lockdep.c:2031. Fix this up by removing the early re-enable,
      we were already re-enabling IRQs post-trace_hardirqs_on() already, so
      the semantics are now as was initially intended.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      c347d12c
    • Linus Torvalds's avatar
      Fix WARN_ON() on bitfield ops · 8d4fbcfb
      Linus Torvalds authored
      Alexey Dobriyan noticed that the new WARN_ON() semantics that were
      introduced by commit 684f9783 (to also
      return the value to be warned on) didn't compile when given a bitfield,
      because the typeof doesn't work for bitfields.
      
      So instead of the typeof trick, use an "int" variable together with a
      "!!(x)" expression, as suggested by Al Viro.
      
      To make matters more interesting, Paul Mackerras points out that that is
      sub-optimal on Power, but the old asm-coded comparison seems to be buggy
      anyway on 32-bit Power if the conditional was 64-bit, so I think there
      are more problems there.
      
      Regardless, the new WARN_ON() semantics may have been a bad idea.  But
      this at least avoids the more serious complications.
      
      Cc: Alexey Dobriyan <adobriyan@sw.ru>
      Cc: Herbert Xu <herbert@gondor.apana.org.au>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Al Viro <viro@ftp.linux.org.uk>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Andrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      8d4fbcfb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 2f63251e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (28 commits)
        [WATCHDOG] Fix pcwd_init_module crash
        [WATCHDOG] ICH9 support for iTCO_wdt
        [WATCHDOG] 631xESB/632xESB support for iTCO_wdt - add all LPC bridges
        [WATCHDOG] 631xESB/632xESB support for iTCO_wdt
        [WATCHDOG] omap_wdt.c - default error for IOCTL is -ENOTTY
        [WATCHDOG] Return value of nonseekable_open
        [WATCHDOG] mv64x60_wdt: Rework the timeout register manipulation
        [WATCHDOG] mv64x60_wdt: disable watchdog timer when driver is probed
        [WATCHDOG] mv64x60_wdt: Support the WDIOF_MAGICCLOSE feature
        [WATCHDOG] mv64x60_wdt: Add a module parameter to change nowayout setting
        [WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
        [WATCHDOG] mv64x60_wdt: Support for WDIOC_SETTIMEOUT ioctl
        [WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
        [WATCHDOG] mv64x60_wdt: Check return value of nonseekable_open
        [WATCHDOG] mv64x60_wdt: Add arch/powerpc platform support
        [WATCHDOG] mv64x60_wdt: Get register address from platform data
        [WATCHDOG] mv64x60_wdt: set up platform_device in platform code
        [WATCHDOG] ensure mouse and keyboard ignored in w83627hf_wdt
        [WATCHDOG] s3c2410_wdt: fixup after arch include moves
        [WATCHDOG] git-watchdog-typo
        ...
      2f63251e
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · d6dd9e93
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (50 commits)
        [MIPS] Add smp_call_function_single()
        [MIPS] thread_info.h: kmalloc + memset conversion to kzalloc
        [MIPS] Kexec: Fix several 64-bit bugs.
        [MIPS] Kexec: Fix several warnings.
        [MIPS] DDB5477: Remove support
        [MIPS] Fulong: Remove unneeded header file
        [MIPS] Cobalt: Enable UART on RaQ1
        [MIPS] Remove unused GROUP_TOSHIBA_NAMES
        [MIPS] remove some duplicate includes
        [MIPS] Oprofile: Fix rm9000 performance counter handler
        [MIPS] Use -Werror on subdirectories which build cleanly.
        [MIPS] Yosemite: Fix warning.
        [MIPS] PMON: Fix cpustart declaration.
        [MIPS] Yosemite: Only build ll_ht_smp_irq_handler() if HYPERTRANSPORT.
        [MIPS] Yosemite: Fix build error due to undeclared titan_mailbox_irq().
        [MIPS] Yosemite: Don't declare titan_mailbox_irq() as asmlinkage.
        [MIPS] Yosemite: Fix warnings in i2c-yoesmite by deleting the unused code.
        [MIPS] Delete unused arch/mips/gt64120/common/
        [MIPS] Fix build warning in unaligned load/store emulator.
        [MIPS] IP32: Don't ignore request_irq's return value.
        ...
      d6dd9e93
    • Linus Torvalds's avatar
      Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 · dd9cd6d4
      Linus Torvalds authored
      * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
        hwmon: fscher read control bugfix
        hwmon: (adm1031) Fix broken links in documentation
        hwmon: make abituguru3_read_increment_offset() static
        hwmon: Fix regression caused by typo in lm90.c
        hwmon: (applesmc) add temperature sensors set for Macbook
        hwmon: fscher control update bugfix
        hwmon: fix dme1737 temp fault attribute
        hwmon: Add missing __devexit tags in various drivers
        hwmon: clean up duplicate includes
        hwmon: fix lm78 detection regression
        hwmon: fix array overruns in lm93.c
        hwmon: add support for THMC50 and ADM1022
      dd9cd6d4
    • Len Brown's avatar
      ACPI: delete CONFIG_ACPI_PROCFS_SLEEP (again) · 128a2bcf
      Len Brown authored
      CONFIG_ACPI_PROCFS_SLEEP is a NO-OP -- delete it (again).
      
      Apparently 296699de creating CONFIG_SUSPEND
      and CONFIG_PM_SLEEP was based on an out-dated version of drivers/acpi/Kconfig,
      as it erroneously restored this recently deleted config option.
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      128a2bcf
  2. 31 Jul, 2007 32 commits