# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID 2dce18258c3d533016b666230eb199940d336c2b
# Parent  318db79dbab017835bc428a39fd1b1312dd0f4aa
changes of kconfig for dom0 vp model.
PATCHNAME: arch_ia64_kconfig_linux

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 318db79dbab0 -r 2dce18258c3d buildconfigs/linux-defconfig_xen0_ia64
--- a/buildconfigs/linux-defconfig_xen0_ia64	Wed May 10 15:33:01 2006 +0900
+++ b/buildconfigs/linux-defconfig_xen0_ia64	Wed May 10 15:33:02 2006 +0900
@@ -1523,3 +1523,19 @@ CONFIG_CRYPTO_DES=y
 #
 # Hardware crypto devices
 #
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_XEN_PCIDEV_BACKEND is not set
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
+# CONFIG_XEN_NETDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+# CONFIG_XEN_NETDEV_FRONTEND is not set
+# CONFIG_XEN_BLKDEV_TAP is not set
+# CONFIG_XEN_SCRUB_PAGES is not set
+# CONFIG_HAVE_ARCH_ALLOC_SKB is not set
+# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set
+
+#
+# XEN
+#
+# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
+# CONFIG_XEN_DISABLE_SERIAL is not set
diff -r 318db79dbab0 -r 2dce18258c3d buildconfigs/linux-defconfig_xenU_ia64
--- a/buildconfigs/linux-defconfig_xenU_ia64	Wed May 10 15:33:01 2006 +0900
+++ b/buildconfigs/linux-defconfig_xenU_ia64	Wed May 10 15:33:02 2006 +0900
@@ -1387,3 +1387,19 @@ CONFIG_CRYPTO_DES=y
 #
 # Hardware crypto devices
 #
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_XEN_PCIDEV_BACKEND is not set
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
+# CONFIG_XEN_NETDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+# CONFIG_XEN_NETDEV_FRONTEND is not set
+# CONFIG_XEN_BLKDEV_TAP is not set
+# CONFIG_XEN_SCRUB_PAGES is not set
+# CONFIG_HAVE_ARCH_ALLOC_SKB is not set
+# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set
+
+#
+# XEN
+#
+# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
+# CONFIG_XEN_DISABLE_SERIAL is not set
diff -r 318db79dbab0 -r 2dce18258c3d buildconfigs/linux-defconfig_xen_ia64
--- a/buildconfigs/linux-defconfig_xen_ia64	Wed May 10 15:33:01 2006 +0900
+++ b/buildconfigs/linux-defconfig_xen_ia64	Wed May 10 15:33:02 2006 +0900
@@ -1529,3 +1529,19 @@ CONFIG_CRYPTO_DES=y
 #
 # Hardware crypto devices
 #
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_XEN_PCIDEV_BACKEND is not set
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
+# CONFIG_XEN_NETDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+# CONFIG_XEN_NETDEV_FRONTEND is not set
+# CONFIG_XEN_BLKDEV_TAP is not set
+# CONFIG_XEN_SCRUB_PAGES is not set
+# CONFIG_HAVE_ARCH_ALLOC_SKB is not set
+# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set
+
+#
+# XEN
+#
+# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
+# CONFIG_XEN_DISABLE_SERIAL is not set
diff -r 318db79dbab0 -r 2dce18258c3d linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Wed May 10 15:33:01 2006 +0900
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Wed May 10 15:33:02 2006 +0900
@@ -63,32 +63,6 @@ config ARCH_XEN
 	help
 	  TEMP ONLY. Needs to be on for drivers/xen to build.
 
-config XEN_PRIVILEGED_GUEST
-	bool "Privileged Guest"
-	default n
-	help
-	  Used in drivers/xen/privcmd.c.  Should go away?
-
-config XEN_BLKDEV_GRANT
-	depends on XEN
-	bool
-	default y
-
-config XEN_BLKDEV_FRONTEND
-	depends on XEN
-	bool
-	default y
-
-config XEN_BACKEND
-	depends on XEN
-	bool
-	default y
-
-config XEN_BLKDEV_BACKEND
-	depends on XEN && XEN_BACKEND
-	bool
-	default y
-
 config XEN_IA64_DOM0_VP
 	bool "dom0 vp model"
 	depends on XEN
@@ -102,18 +76,6 @@ config XEN_IA64_DOM0_NON_VP
 	default y
 	help
 	  dom0 P=M model
-
-config XEN_SYSFS
-	bool "Export Xen attributes in sysfs"
-	depends on XEN && SYSFS
-	default y
-	help
-		Xen hypervisor attributes will show up under /sys/hypervisor/.
-
-config XEN_INTERFACE_VERSION
-	hex
-	depends on XEN
-	default 0x00030202
 
 config SCHED_NO_NO_OMIT_FRAME_POINTER
 	bool
@@ -532,3 +494,16 @@ source "security/Kconfig"
 source "security/Kconfig"
 
 source "crypto/Kconfig"
+
+# override default values of drivers/xen/Kconfig
+if !XEN_IA64_DOM0_VP
+config HAVE_ARCH_ALLOC_SKB
+        bool
+        default n
+
+config HAVE_ARCH_DEV_ALLOC_SKB
+        bool
+        default n
+endif
+
+source "drivers/xen/Kconfig"