summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 13:53:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 13:53:24 -0700
commit709d9f54cc1847a2d24224ffedec7fd4d0f3c714 (patch)
tree28aa81a0f7425be438eb1a31e33a1d8ae90c0292 /arch/x86/kernel/smpboot.c
parentcca8209ed962f87990345ba073979d2b55dd1187 (diff)
parentb0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff)
downloadop-kernel-dev-709d9f54cc1847a2d24224ffedec7fd4d0f3c714.zip
op-kernel-dev-709d9f54cc1847a2d24224ffedec7fd4d0f3c714.tar.gz
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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0116552..a3df9f8 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -63,7 +63,6 @@
#include <asm/tlbflush.h>
#include <asm/mtrr.h>
#include <asm/mwait.h>
-#include <asm/vmi.h>
#include <asm/apic.h>
#include <asm/setup.h>
#include <asm/uv/uv.h>
@@ -312,7 +311,6 @@ notrace static void __cpuinit start_secondary(void *unused)
__flush_tlb_all();
#endif
- vmi_bringup();
cpu_init();
preempt_disable();
smp_callin();
OpenPOWER on IntegriCloud