Signed-off-by: Andi Kleen Index: linux/arch/i386/Kconfig =================================================================== --- linux.orig/arch/i386/Kconfig +++ linux/arch/i386/Kconfig @@ -215,9 +215,8 @@ config X86_ES7000 endchoice config PARAVIRT - bool "Paravirtualization support (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on !(X86_VISWS || X86_VOYAGER) + bool + default n help Paravirtualization is a way of running multiple instances of Linux on the same machine, under a hypervisor. This option @@ -230,7 +229,9 @@ source "arch/i386/xen/Kconfig" config VMI bool "VMI Paravirt-ops support" - depends on PARAVIRT + select PARAVIRT + depends on EXPERIMENTAL + depends on !(X86_VISWS || X86_VOYAGER) help VMI provides a paravirtualized interface to the VMware ESX server (it could be used by other hypervisors in theory too, but is not Index: linux/arch/i386/xen/Kconfig =================================================================== --- linux.orig/arch/i386/xen/Kconfig +++ linux/arch/i386/xen/Kconfig @@ -4,7 +4,10 @@ config XEN bool "Enable support for Xen hypervisor" - depends on PARAVIRT && X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES + select PARAVIRT + depends on EXPERIMENTAL + depends on !(X86_VISWS || X86_VOYAGER) + depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES help This is the Linux Xen port. Enabling this will allow the kernel to boot in a paravirtualized environment under the Index: linux/drivers/lguest/Kconfig =================================================================== --- linux.orig/drivers/lguest/Kconfig +++ linux/drivers/lguest/Kconfig @@ -1,6 +1,8 @@ +if X86_32 config LGUEST tristate "Linux hypervisor example code" - depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE + depends on X86 EXPERIMENTAL && !X86_PAE + depends on !(X86_VISWS || X86_VOYAGER) select LGUEST_GUEST select HVC_DRIVER ---help--- @@ -26,3 +28,4 @@ config LGUEST_NET config LGUEST_BLOCK tristate depends on LGUEST_GUEST && BLOCK +endif