diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /arch/x86/kernel/mpparse.c | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
| -rw-r--r-- | arch/x86/kernel/mpparse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index c0601c2848a1..a649a4ccad43 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <asm/e820.h> | 27 | #include <asm/e820.h> |
| 28 | #include <asm/trampoline.h> | 28 | #include <asm/trampoline.h> |
| 29 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
| 30 | #include <asm/smp.h> | ||
| 30 | 31 | ||
| 31 | #include <mach_apic.h> | 32 | #include <mach_apic.h> |
| 32 | #ifdef CONFIG_X86_32 | 33 | #ifdef CONFIG_X86_32 |