diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 16:18:17 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 16:18:17 -0400 |
| commit | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (patch) | |
| tree | 2529afef2a74c40beaa3794d07b1b4a8ab374278 /arch/x86/kernel/smpboot.c | |
| parent | 51ea8a88aae425915b458bfe295f1f10a3d52781 (diff) | |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
Merge branch 'x86/vmware' into x86/trampoline
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 8b3bfc4dd708..63a1a5596ac0 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | #include <asm/pgtable.h> | 62 | #include <asm/pgtable.h> |
| 63 | #include <asm/tlbflush.h> | 63 | #include <asm/tlbflush.h> |
| 64 | #include <asm/mtrr.h> | 64 | #include <asm/mtrr.h> |
| 65 | #include <asm/vmi.h> | ||
| 66 | #include <asm/apic.h> | 65 | #include <asm/apic.h> |
| 67 | #include <asm/setup.h> | 66 | #include <asm/setup.h> |
| 68 | #include <asm/uv/uv.h> | 67 | #include <asm/uv/uv.h> |
| @@ -311,7 +310,6 @@ notrace static void __cpuinit start_secondary(void *unused) | |||
| 311 | __flush_tlb_all(); | 310 | __flush_tlb_all(); |
| 312 | #endif | 311 | #endif |
| 313 | 312 | ||
| 314 | vmi_bringup(); | ||
| 315 | cpu_init(); | 313 | cpu_init(); |
| 316 | preempt_disable(); | 314 | preempt_disable(); |
| 317 | smp_callin(); | 315 | smp_callin(); |