diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 16:11:51 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 16:11:51 -0800 |
| commit | 638bee71c83a2837b48062fdc5b222163cf53d79 (patch) | |
| tree | 9c1699c07a5aa547d769138317279b8ee1ba89e8 /arch/x86/kernel/crash.c | |
| parent | 2aaa822984b97efd894d10d1e1382206ef0291a7 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'arch/x86/kernel/crash.c')
| -rw-r--r-- | arch/x86/kernel/crash.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index c689d19e35a..ff958248e61 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -24,12 +24,10 @@ #include <asm/apic.h> #include <asm/hpet.h> #include <linux/kdebug.h> -#include <asm/smp.h> +#include <asm/cpu.h> #include <asm/reboot.h> #include <asm/virtext.h> -#include <mach_ipi.h> - #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) |