diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 13:18:17 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 13:18:17 -0700 |
| 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 8b3bfc4dd70..63a1a5596ac 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -62,7 +62,6 @@ #include <asm/pgtable.h> #include <asm/tlbflush.h> #include <asm/mtrr.h> -#include <asm/vmi.h> #include <asm/apic.h> #include <asm/setup.h> #include <asm/uv/uv.h> @@ -311,7 +310,6 @@ notrace static void __cpuinit start_secondary(void *unused) __flush_tlb_all(); #endif - vmi_bringup(); cpu_init(); preempt_disable(); smp_callin(); |