diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-05-14 11:11:21 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-16 04:25:14 +0200 |
| commit | cafcd80d216bc2136b8edbb794327e495792c666 (patch) | |
| tree | 4eb819c124684b14d48faf094316e8dd3ba4b73a /include/linux/nmi.h | |
| parent | 23637d477c1f53acbb176a02c241d60a25888fae (diff) | |
| download | linux-3.10-cafcd80d216bc2136b8edbb794327e495792c666.tar.gz linux-3.10-cafcd80d216bc2136b8edbb794327e495792c666.tar.bz2 linux-3.10-cafcd80d216bc2136b8edbb794327e495792c666.zip | |
lockup_detector: Cross arch compile fixes
Combining the softlockup and hardlockup code causes watchdog.c
to build even without the hardlockup detection support.
So if an arch, that has the previous and the new nmi watchdog
implementations cohabiting, wants to know if the generic one
is in use, CONFIG_LOCKUP_DETECTOR is not a reliable check.
We need to use CONFIG_HARDLOCKUP_DETECTOR instead.
Fixes:
kernel/built-in.o: In function `touch_nmi_watchdog':
(.text+0x449bc): multiple definition of `touch_nmi_watchdog'
arch/sparc/kernel/built-in.o:(.text+0x11b28): first defined here
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
LKML-Reference: <20100514151121.GR15159@redhat.com>
[ use CONFIG_HARDLOCKUP_DETECTOR instead of CONFIG_PERF_EVENTS_NMI]
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'include/linux/nmi.h')
| -rw-r--r-- | include/linux/nmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index abd48aacaf7..06aab5eee13 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -20,7 +20,7 @@ extern void touch_nmi_watchdog(void); extern void acpi_nmi_disable(void); extern void acpi_nmi_enable(void); #else -#ifndef CONFIG_LOCKUP_DETECTOR +#ifndef CONFIG_HARDLOCKUP_DETECTOR static inline void touch_nmi_watchdog(void) { touch_softlockup_watchdog(); |