From: tip-bot for Ingo Molnar on
Commit-ID: 5e85391b3badd3f0e50ebdd0cafe0202a979f73a
Author: Ingo Molnar <mingo(a)>
AuthorDate: Thu, 13 May 2010 09:12:39 +0200
Committer: Ingo Molnar <mingo(a)>
CommitDate: Thu, 13 May 2010 09:12:39 +0200

x86, watchdog: Fix build error in hw_nmi.c

On some configs the following build error triggers:

arch/x86/kernel/apic/hw_nmi.c:35: error: 'apic' undeclared (first use in this function)
arch/x86/kernel/apic/hw_nmi.c:35: error: (Each undeclared identifier is reported only once
arch/x86/kernel/apic/hw_nmi.c:35: error: for each function it appears in.)

Because asm/apic.h was only included implicitly. Include it explicitly.

Cc: Frederic Weisbecker <fweisbec(a)>
Cc: Don Zickus <dzickus(a)>
Cc: Peter Zijlstra <peterz(a)>
Cc: Cyrill Gorcunov <gorcunov(a)>
LKML-Reference: <1273713674-8434-1-git-send-regression-fweisbec(a)>
Signed-off-by: Ingo Molnar <mingo(a)>
arch/x86/kernel/apic/hw_nmi.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index 3b40082..cefd694 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -8,6 +8,7 @@
* Bits copied from original nmi.c file
+#include <asm/apic.h>

#include <linux/cpumask.h>
#include <linux/kdebug.h>
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at