diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c876bace8fdc..07e01149e3bf 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -491,7 +491,7 @@ if PARAVIRT_GUEST | |||
491 | source "arch/x86/xen/Kconfig" | 491 | source "arch/x86/xen/Kconfig" |
492 | 492 | ||
493 | config VMI | 493 | config VMI |
494 | bool "VMI Guest support" | 494 | bool "VMI Guest support (DEPRECATED)" |
495 | select PARAVIRT | 495 | select PARAVIRT |
496 | depends on X86_32 | 496 | depends on X86_32 |
497 | ---help--- | 497 | ---help--- |
@@ -500,6 +500,15 @@ config VMI | |||
500 | at the moment), by linking the kernel to a GPL-ed ROM module | 500 | at the moment), by linking the kernel to a GPL-ed ROM module |
501 | provided by the hypervisor. | 501 | provided by the hypervisor. |
502 | 502 | ||
503 | As of September 2009, VMware has started a phased retirement | ||
504 | of this feature from VMware's products. Please see | ||
505 | feature-removal-schedule.txt for details. If you are | ||
506 | planning to enable this option, please note that you cannot | ||
507 | live migrate a VMI enabled VM to a future VMware product, | ||
508 | which doesn't support VMI. So if you expect your kernel to | ||
509 | seamlessly migrate to newer VMware products, keep this | ||
510 | disabled. | ||
511 | |||
503 | config KVM_CLOCK | 512 | config KVM_CLOCK |
504 | bool "KVM paravirtualized clock" | 513 | bool "KVM paravirtualized clock" |
505 | select PARAVIRT | 514 | select PARAVIRT |