Don Zickus
4a7863cc2e
x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR ...
The x86 arch has shifted its use of the nmi_watchdog from a
local implementation to the global one provide by
kernel/watchdog.c. This shift has caused a whole bunch of
compile problems under different config options. I attempt to
simplify things with the patch below.
In order to simplify things, I had to come to terms with the
meaning of two terms ARCH_HAS_NMI_WATCHDOG and
CONFIG_HARDLOCKUP_DETECTOR. Basically they mean the same thing,
the former on a local level and the latter on a global level.
With the old x86 nmi watchdog gone, there is no need to rely on
defining the ARCH_HAS_NMI_WATCHDOG variable because it doesn't
make sense any more. x86 will now use the global
implementation.
The changes below do a few things. First it changes the few
places that relied on ARCH_HAS_NMI_WATCHDOG to use
CONFIG_X86_LOCAL_APIC (the former was an alias for the latter
anyway, so nothing unusual here). Those pieces of code were
relying more on local apic functionality the nmi watchdog
functionality, so the change should make sense.
Second, I removed the x86 implementation of
touch_nmi_watchdog(). It isn't need now, instead x86 will rely
on kernel/watchdog.c's implementation.
Third, I removed the #define ARCH_HAS_NMI_WATCHDOG itself from
x86. And tweaked the include/linux/nmi.h file to tell users to
look for an externally defined touch_nmi_watchdog in the case of
ARCH_HAS_NMI_WATCHDOG _or_ CONFIG_HARDLOCKUP_DETECTOR. This
changes removes some of the ugliness in that file.
Finally, I added a Kconfig dependency for
CONFIG_HARDLOCKUP_DETECTOR that said you can't have
ARCH_HAS_NMI_WATCHDOG _and_ CONFIG_HARDLOCKUP_DETECTOR. You can
only have one nmi_watchdog.
Tested with
ARCH=i386: allnoconfig, defconfig, allyesconfig, (various broken
configs) ARCH=x86_64: allnoconfig, defconfig, allyesconfig,
(various broken configs)
Hopefully, after this patch I won't get any more compile broken
emails. :-)
v3:
changed a couple of 'linux/nmi.h' -> 'asm/nmi.h' to pick-up correct function
prototypes when CONFIG_HARDLOCKUP_DETECTOR is not set.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: fweisbec@gmail.com
LKML-Reference: <1293044403-14117-1-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-12-22 22:15:32 +01:00
lib: add support for LZO-compressed kernels
2010-01-11 09:34:04 -08:00
Move .gitignore from drivers/md to lib/raid6
2010-08-30 17:35:52 +10:00
trivial: fix typo "to to" in multiple files
2009-09-21 15:14:55 +02:00
inflate_fast: sout is already a short so ptr arith was off by one.
2010-03-12 15:52:44 -08:00
tree-wide: convert open calls to remove spaces to skip_spaces() lib function
2009-12-15 08:53:32 -08:00
lib: Fix atomic64_add_unless return value convention
2010-03-01 11:38:46 -08:00
ARM: 6213/1: atomic64_test: add ARM as supported architecture
2010-07-27 10:43:46 +01:00
rtc: BCD codeshrink
2008-07-24 10:47:33 -07:00
lib/bitmap.c: use hex_to_bin()
2010-10-26 16:52:18 -07:00
lib/btree: fix possible NULL pointer dereference
2010-05-15 12:48:10 -07:00
modules: Fix module_bug_list list corruption race
2010-10-05 11:29:27 -07:00
oops handling: ensure that any oops is flushed to the mtdoops console
2009-01-06 15:59:11 -08:00
lib/checksum: fix one more thinko
2009-11-03 16:06:53 +01:00
generic, memparse(): constify argument
2008-07-28 15:05:23 +02:00
fault-injection: add CPU notifier error injection module
2010-05-27 09:12:48 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
revert "crc32: use __BYTE_ORDER macro for endian detection"
2010-05-26 08:19:23 -07:00
ctype: constify read-only _ctype string
2009-12-15 08:53:32 -08:00
Revert "debug_locks: set oops_in_progress if we will log messages."
2010-11-29 15:18:28 -08:00
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:17:58 -07:00
atomic: only take lock when the counter drops to zero on UP as well
2009-06-16 19:47:47 -07:00
Add LZO compression support for initramfs and old-style initrd
2010-01-11 09:34:05 -08:00
lib/decompress_bunzip2.c: fix checkstack warning
2010-08-11 08:59:23 -07:00
lzma/gzip: fix potential oops when input data is truncated
2009-09-24 07:21:05 -07:00
lzma/gzip: fix potential oops when input data is truncated
2009-09-24 07:21:05 -07:00
lib: fix the use of LZO to decompress initramfs images
2010-04-24 11:31:25 -07:00
lib/devres.c: fix comment typo
2010-07-11 22:16:32 +02:00
div64_u64(): improve precision on 32bit platforms
2010-10-26 16:52:19 -07:00
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2010-10-22 19:36:42 -07:00
module: trim exception table on init free.
2009-06-12 21:47:04 +09:30
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
bitmap: find_last_bit()
2009-01-01 10:12:19 +10:30
flex_array: add helpers to get and put to make pointers easy to use
2010-08-09 20:45:09 -07:00
lib: add lib/gcd.c
2009-06-18 13:04:05 -07:00
crc32: major optimization
2010-05-25 08:07:06 -07:00
genalloc: fix allocation from end of pool
2010-06-29 15:29:30 -07:00
lib: introduce common method to convert hex digits
2010-05-25 08:07:05 -07:00
x86: Add optimized popcnt variants
2010-04-06 15:52:11 -07:00
docbook: add idr/ida to kernel-api docbook
2010-10-26 17:40:56 -07:00
MN10300: Don't try and #include <linux/slab.h> in lib/inflate.c from bootloader
2010-08-12 09:51:35 -07:00
Use WARN() in lib/
2008-07-26 12:00:07 -07:00
iommu: inline iommu_num_pages
2010-08-09 20:45:05 -07:00
x86, ioremap: Fix incorrect physical address handling in PAE mode
2010-07-09 11:42:03 -07:00
kernel: is_current_single_threaded: don't use ->mmap_sem
2009-07-17 09:11:31 +10:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Merge branch 'async' of macbook:git/btrfs-unstable
2010-08-09 10:36:44 +01:00
x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR
2010-12-22 22:15:32 +01:00
mips,kgdb: kdb low level trap catch and stack trace
2010-05-20 21:04:26 -05:00
kmemcheck: depend on HAVE_ARCH_KMEMCHECK
2009-07-01 22:28:44 +02:00
bkl: Fixup core_lock fallout
2009-12-14 23:55:33 +01:00
driver core: Remove completion from struct klist_node
2009-01-06 10:44:30 -08:00
kobject: Introduce kset_find_obj_hinted.
2010-10-22 10:16:44 -07:00
kobject_uevent: fix typo in comments
2010-08-23 18:12:46 -07:00
kref: remove kref_set
2010-05-21 09:37:29 -07:00
block: Fix overrun in lcm() and move it to lib
2010-03-15 12:47:59 +01:00
libcrc32c: Fix "crc32c undefined" compilation error
2008-12-25 11:01:42 +11:00
list debugging: warn when deleting a deleted entry
2010-08-09 20:45:08 -07:00
lib/list_sort: test: check element addresses
2010-10-26 16:52:19 -07:00
locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]
2009-03-13 01:32:36 +01:00
The DRBD driver
2009-10-01 21:17:49 +02:00
Merge branch 'async' of macbook:git/btrfs-unstable
2010-08-09 10:36:44 +01:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
2009-03-26 22:45:23 -07:00
lib/parser: cleanup match_number()
2010-10-26 16:52:19 -07:00
percpu_counter: use this_cpu_ptr() instead of per_cpu_ptr()
2010-10-26 16:52:19 -07:00
plist: Make plist debugging raw_spinlock aware
2009-12-14 23:55:33 +01:00
lib: fix sparse shadowed variable warning
2009-01-06 15:59:11 -08:00
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-01-06 17:10:04 -08:00
radix-tree: fix RCU bug
2010-11-12 07:55:32 -08:00
Merge branch 'master' into for-next
2010-06-16 18:08:13 +02:00
ratelimit: fix the return value when __ratelimit() fails to acquire the lock
2010-04-07 08:38:04 -07:00
lib/rational.c needs module.h
2010-01-11 09:34:05 -08:00
rbtree: Undo augmented trees performance damage and regression
2010-07-05 14:43:50 +02:00
rwsem generic spinlock: use IRQ save/restore spinlocks
2010-04-07 16:15:05 -07:00
rwsem: smaller wrappers around rwsem_down_failed_common
2010-08-09 20:45:11 -07:00
scatterlist: prevent invalid free when alloc fails
2010-08-30 19:55:09 +02:00
mm: use the same log level for show_mem()
2010-03-06 11:26:27 -08:00
cpumask: convert lib/smp_processor_id to new cpumask ops
2009-01-30 15:47:34 +01:00
generic swap(): lib/sort.c: rename swap to swap_func
2009-01-08 08:31:14 -08:00
locking: Further name space cleanups
2009-12-14 23:55:33 +01:00
lib/string.c: simplify strnstr()
2010-03-06 11:26:35 -08:00
[SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact
2008-10-23 11:42:20 -05:00
swiotlb: Use page alignment for early buffer allocation
2010-10-11 17:08:36 -04:00
task_current_syscall
2008-07-26 12:00:10 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Unified UUID/GUID definition
2010-05-19 22:40:47 -04:00
lib: fix scnprintf() if @size is == 0
2010-10-26 16:52:16 -07:00
4a7863cc2e