[tip:perf/nmi] nmi_watchdog: Fix undefined 'apic' build bug
in [Kernel]
|
Prev: [PATCH -mm 1/2] frv: add a pointer to Documentation/DMA-API.txt
Next: [PATCH -mm 2/2] mn10300: add a pointer to Documentation/DMA-API.txt
From: tip-bot for Don Zickus on 20 Feb 2010 03:20 Commit-ID: 2cc4452bc31fc1cde6f0b64a4eb13269f982787d Gitweb: http://git.kernel.org/tip/2cc4452bc31fc1cde6f0b64a4eb13269f982787d Author: Don Zickus <dzickus(a)redhat.com> AuthorDate: Thu, 18 Feb 2010 21:56:52 -0500 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Fri, 19 Feb 2010 23:04:13 +0100 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(a)redhat.com> Cc: a.p.zijlstra(a)chello.nl Cc: gorcunov(a)gmail.com Cc: aris(a)redhat.com LKML-Reference: <1266548212-24243-1-git-send-email-dzickus(a)redhat.com> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/apic/hw_nmi.c | 2 ++ 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 312d772..0b4d205 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) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |