diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:53:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:53:24 -0400 |
commit | 709d9f54cc1847a2d24224ffedec7fd4d0f3c714 (patch) | |
tree | 28aa81a0f7425be438eb1a31e33a1d8ae90c0292 /arch/x86/kernel/smpboot.c | |
parent | cca8209ed962f87990345ba073979d2b55dd1187 (diff) | |
parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) |
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI
x86, vmware: Remove deprecated VMI kernel support
Fix up trivial #include conflict in arch/x86/kernel/smpboot.c
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 0116552c950d..a3df9f830037 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -63,7 +63,6 @@ | |||
63 | #include <asm/tlbflush.h> | 63 | #include <asm/tlbflush.h> |
64 | #include <asm/mtrr.h> | 64 | #include <asm/mtrr.h> |
65 | #include <asm/mwait.h> | 65 | #include <asm/mwait.h> |
66 | #include <asm/vmi.h> | ||
67 | #include <asm/apic.h> | 66 | #include <asm/apic.h> |
68 | #include <asm/setup.h> | 67 | #include <asm/setup.h> |
69 | #include <asm/uv/uv.h> | 68 | #include <asm/uv/uv.h> |
@@ -312,7 +311,6 @@ notrace static void __cpuinit start_secondary(void *unused) | |||
312 | __flush_tlb_all(); | 311 | __flush_tlb_all(); |
313 | #endif | 312 | #endif |
314 | 313 | ||
315 | vmi_bringup(); | ||
316 | cpu_init(); | 314 | cpu_init(); |
317 | preempt_disable(); | 315 | preempt_disable(); |
318 | smp_callin(); | 316 | smp_callin(); |