git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/apic
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
mce_intel_64.c
diff --git
a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index
f44c366
..
4b7d78c
100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@
-7,6
+7,7
@@
#include <linux/interrupt.h>
#include <linux/percpu.h>
#include <asm/processor.h>
+#include <asm/apic.h>
#include <asm/msr.h>
#include <asm/mce.h>
#include <asm/hw_irq.h>