Subject: Fix xen configuration. From: jbeulich@novell.com Patch-mainline: obsolete --- head-2009-12-16.orig/arch/x86/Kconfig 2009-12-04 10:44:40.000000000 +0100 +++ head-2009-12-16/arch/x86/Kconfig 2009-10-15 11:53:21.000000000 +0200 @@ -158,6 +158,7 @@ config HAVE_CPUMASK_OF_CPU_MAP config ARCH_HIBERNATION_POSSIBLE def_bool y + depends on !XEN config ARCH_SUSPEND_POSSIBLE def_bool y --- head-2009-12-16.orig/arch/x86/Kconfig.debug 2009-12-04 10:44:40.000000000 +0100 +++ head-2009-12-16/arch/x86/Kconfig.debug 2009-10-15 11:53:21.000000000 +0200 @@ -289,7 +289,7 @@ config OPTIMIZE_INLINING config KDB bool "Built-in Kernel Debugger support" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && !XEN select KALLSYMS select KALLSYMS_ALL help --- head-2009-12-16.orig/drivers/xen/Kconfig 2009-12-04 10:44:40.000000000 +0100 +++ head-2009-12-16/drivers/xen/Kconfig 2009-12-18 12:08:28.000000000 +0100 @@ -22,6 +22,7 @@ config XEN_PRIVILEGED_GUEST config XEN_UNPRIVILEGED_GUEST def_bool !XEN_PRIVILEGED_GUEST + select PM config XEN_PRIVCMD def_bool y @@ -116,7 +117,7 @@ config XEN_NETDEV_LOOPBACK config XEN_PCIDEV_BACKEND tristate "PCI-device backend driver" - depends on PCI && XEN_BACKEND + depends on PCI && XEN_PRIVILEGED_GUEST && XEN_BACKEND default XEN_BACKEND help The PCI device backend driver allows the kernel to export arbitrary @@ -127,8 +128,8 @@ config XEN_PCIDEV_BACKEND choice prompt "PCI Backend Mode" depends on XEN_PCIDEV_BACKEND - default XEN_PCIDEV_BACKEND_VPCI if !IA64 default XEN_PCIDEV_BACKEND_CONTROLLER if IA64 + default XEN_PCIDEV_BACKEND_VPCI config XEN_PCIDEV_BACKEND_VPCI bool "Virtual PCI"
