nmi_watchdog: undefined 'apic' compile fix
PATCH 1/1 nmi_watchdog: undefined 'apic' compile fix
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.
--- arch/x86/kernel/apic/hw_nmi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/kernel/apic/hw_nmi.c +2 -0
@@ -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 )
Signature · 1 line
1.6.6.83.gc9a2
[tip:perf/nmi] nmi_watchdog: Fix undefined 'apic' build bug
Commit-ID: 2cc4452bc31fc1cde6f0b64a4eb13269f982787d Gitweb: http://git.kernel.org/tip/2cc4452bc31fc1cde6f0b64a4eb13269f982787d Author: Don Zickus <[email protected]> AuthorDate: Thu, 18 Feb 2010 21:56:52 -0500 Committer: Ingo Molnar <[email protected]> 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.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/apic/hw_nmi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/kernel/apic/hw_nmi.c +2 -0
@@ -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 )