diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-02-18 21:56:52 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-19 17:04:13 -0500 |
| commit | 2cc4452bc31fc1cde6f0b64a4eb13269f982787d (patch) | |
| tree | 408f139a30a151de7c77ebefa51bf8c6dcc81120 | |
| parent | 96ca4028aca0638d0e11dcbfabc4283054072933 (diff) | |
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>
| -rw-r--r-- | 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 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) | |||
| 92 | return cpu_khz * 1000; | 92 | return cpu_khz * 1000; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | #ifdef ARCH_HAS_NMI_WATCHDOG | ||
| 95 | void arch_trigger_all_cpu_backtrace(void) | 96 | void arch_trigger_all_cpu_backtrace(void) |
| 96 | { | 97 | { |
| 97 | int i; | 98 | int i; |
| @@ -108,6 +109,7 @@ void arch_trigger_all_cpu_backtrace(void) | |||
| 108 | mdelay(1); | 109 | mdelay(1); |
| 109 | } | 110 | } |
| 110 | } | 111 | } |
| 112 | #endif | ||
| 111 | 113 | ||
| 112 | /* STUB calls to mimic old nmi_watchdog behaviour */ | 114 | /* STUB calls to mimic old nmi_watchdog behaviour */ |
| 113 | #if defined(CONFIG_X86_LOCAL_APIC) | 115 | #if defined(CONFIG_X86_LOCAL_APIC) |
