diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 20:53:24 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 20:53:24 (GMT) |
| commit | 709d9f54cc1847a2d24224ffedec7fd4d0f3c714 (patch) | |
| tree | 28aa81a0f7425be438eb1a31e33a1d8ae90c0292 /arch/x86/Kconfig | |
| parent | cca8209ed962f87990345ba073979d2b55dd1187 (diff) | |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
| download | linux-709d9f54cc1847a2d24224ffedec7fd4d0f3c714.tar.xz | |
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/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8a86a1e..8c9e609 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -521,25 +521,6 @@ if PARAVIRT_GUEST source "arch/x86/xen/Kconfig" -config VMI - bool "VMI Guest support (DEPRECATED)" - select PARAVIRT - depends on X86_32 - ---help--- - VMI provides a paravirtualized interface to the VMware ESX server - (it could be used by other hypervisors in theory too, but is not - at the moment), by linking the kernel to a GPL-ed ROM module - provided by the hypervisor. - - As of September 2009, VMware has started a phased retirement - of this feature from VMware's products. Please see - feature-removal-schedule.txt for details. If you are - planning to enable this option, please note that you cannot - live migrate a VMI enabled VM to a future VMware product, - which doesn't support VMI. So if you expect your kernel to - seamlessly migrate to newer VMware products, keep this - disabled. - config KVM_CLOCK bool "KVM paravirtualized clock" select PARAVIRT |