summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2010-02-19 03:56:52 +0100
committerIngo Molnar <mingo@elte.hu>2010-02-19 23:04:13 +0100
commit2cc4452bc31fc1cde6f0b64a4eb13269f982787d (patch)
tree408f139a30a151de7c77ebefa51bf8c6dcc81120 /arch/x86/kernel/apic
parentnmi_watchdog: Properly configure for software events (diff)
downloadlinux-2cc4452bc31fc1cde6f0b64a4eb13269f982787d.tar.xz
linux-2cc4452bc31fc1cde6f0b64a4eb13269f982787d.zip
nmi_watchdog: Fix undefined 'apic' build bug
Ingo provided me a config that fails to compile with: arch/x86/built-in.o: In function `arch_trigger_all_cpu_backtrace': (.text+0x17e78): undefined reference to `apic' make: *** [.tmp_vmlinux1] Error 1 I realized I changed the compile behaviour of the nmi code by not wrapping it with CONFIG_LOCAL_APIC. To fix this I add a compile check for ARCH_HAS_NMI_WATCHDOG around arch_trigger_all_cpu_backtrace. Signed-off-by: Don Zickus <dzickus@redhat.com> Cc: a.p.zijlstra@chello.nl Cc: gorcunov@gmail.com Cc: aris@redhat.com LKML-Reference: <1266548212-24243-1-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r--arch/x86/kernel/apic/hw_nmi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index 312d772c5c35..0b4d205a6b8e 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -92,6 +92,7 @@ u64 hw_nmi_get_sample_period(void)
return cpu_khz * 1000;
}
+#ifdef ARCH_HAS_NMI_WATCHDOG
void arch_trigger_all_cpu_backtrace(void)
{
int i;
@@ -108,6 +109,7 @@ void arch_trigger_all_cpu_backtrace(void)
mdelay(1);
}
}
+#endif
/* STUB calls to mimic old nmi_watchdog behaviour */
#if defined(CONFIG_X86_LOCAL_APIC)