From: Don Zickus <dzickus@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Don Zickus <dzickus@redhat.com>,
mingo@elte.hu, a.p.zijlstra@chello.nl, gorcunov@gmail.com,
aris@redhat.com
Subject: [PATCH] nmi_watchdog: undefined 'apic' compile fix
Date: Thu, 18 Feb 2010 21:56:52 -0500 [thread overview]
Message-ID: <1266548212-24243-1-git-send-email-dzickus@redhat.com> (raw)
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>
---
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)
--
1.6.6.83.gc9a2
next reply other threads:[~2010-02-19 2:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-19 2:56 Don Zickus [this message]
2010-02-20 8:12 ` [tip:perf/nmi] nmi_watchdog: Fix undefined 'apic' build bug tip-bot for Don Zickus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1266548212-24243-1-git-send-email-dzickus@redhat.com \
--to=dzickus@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=aris@redhat.com \
--cc=gorcunov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome