aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2010-12-13 10:31:58 -0500
committerIngo Molnar <mingo@elte.hu>2010-12-13 12:23:23 -0500
commit5f29805a4f4627e766f862ff9f10c14f5f314359 (patch)
tree4feba54ee18763121e9b2424f47c880709cd68cd
parent67b96c182c36c83cd6881122b4a7922b2634047b (diff)
x86, watchdog: Compile fix when CONFIG_LOCAL_APIC not enabled
When adjusting the code to handle removing the old nmi watchdog, I forgot to consider the compile case when the local apic is not enabled. This change fixes the following build error: arch/x86/kernel/apic/hw_nmi.c:28:6: error: redefinition of ‘touch_nmi_watchdog’ Signed-off-by: Don Zickus <dzickus@redhat.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Rakib Mullick <rakib.mullick@gmail.com> LKML-Reference: <20101213153719.GD18577@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/apic/hw_nmi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index c558e1101edf..93da91df5b38 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -17,6 +17,7 @@
17#include <linux/nmi.h> 17#include <linux/nmi.h>
18#include <linux/module.h> 18#include <linux/module.h>
19 19
20#ifdef ARCH_HAS_NMI_WATCHDOG
20#ifdef CONFIG_HARDLOCKUP_DETECTOR 21#ifdef CONFIG_HARDLOCKUP_DETECTOR
21u64 hw_nmi_get_sample_period(void) 22u64 hw_nmi_get_sample_period(void)
22{ 23{
@@ -31,6 +32,8 @@ void touch_nmi_watchdog(void)
31} 32}
32EXPORT_SYMBOL(touch_nmi_watchdog); 33EXPORT_SYMBOL(touch_nmi_watchdog);
33#endif 34#endif
35#endif
36
34#ifdef arch_trigger_all_cpu_backtrace 37#ifdef arch_trigger_all_cpu_backtrace
35/* For reliability, we're prepared to waste bits here. */ 38/* For reliability, we're prepared to waste bits here. */
36static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly; 39static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;