Subject: Fix xen configuration.
From: jbeulich@novell.com
Patch-mainline: n/a

--- head-2010-03-24.orig/arch/x86/Kconfig	2010-03-24 14:37:43.000000000 +0100
+++ head-2010-03-24/arch/x86/Kconfig	2010-03-24 15:02:14.000000000 +0100
@@ -168,6 +168,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-2010-03-24.orig/arch/x86/Kconfig.debug	2010-03-24 14:36:44.000000000 +0100
+++ head-2010-03-24/arch/x86/Kconfig.debug	2010-03-24 15:02:14.000000000 +0100
@@ -312,7 +312,7 @@ config DEBUG_STRICT_USER_COPY_CHECKS
 
 config KDB
 	bool "Built-in Kernel Debugger support"
-	depends on DEBUG_KERNEL
+	depends on DEBUG_KERNEL && !XEN
 	select KALLSYMS
 	select KALLSYMS_ALL
 	help
--- head-2010-03-24.orig/drivers/xen/Kconfig	2010-03-24 14:42:42.000000000 +0100
+++ head-2010-03-24/drivers/xen/Kconfig	2010-03-24 15:02:14.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"