diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:06:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:06:18 +0100 |
commit | 35d266a24796f02f63299cfe5009dfc0d5a0e820 (patch) | |
tree | 492a94d72e54977b2295c6d8fe1663af4d752a33 /arch/x86/kernel/cpu | |
parent | 03b486322e994dde49e67aedb391867b7cf28822 (diff) | |
parent | 2de3a5f7956eb81447feea3aec68193ddd8534bb (diff) | |
download | linux-rt-35d266a24796f02f63299cfe5009dfc0d5a0e820.tar.gz |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c index 4b48f251fd39..5e8c79e748a6 100644 --- 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> |