[Xen-changelog] [IA64] linux: ia64 Kconfig

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 1283874dff103876f7e60c5f352a37f83023a2ec
# Parent  c3506e73b63e187988e96c3a043e7acb7680e332
[IA64] linux: ia64 Kconfig

changes of kconfig for dom0 vp model.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 buildconfigs/linux-defconfig_xen0_ia64 |   16 ++++++++++
 buildconfigs/linux-defconfig_xenU_ia64 |   16 ++++++++++
 buildconfigs/linux-defconfig_xen_ia64  |   16 ++++++++++
 linux-2.6-xen-sparse/arch/ia64/Kconfig |   51 ++++++++-------------------------
 4 files changed, 61 insertions(+), 38 deletions(-)

diff -r c3506e73b63e -r 1283874dff10 buildconfigs/linux-defconfig_xen0_ia64
--- a/buildconfigs/linux-defconfig_xen0_ia64    Wed May 10 15:50:27 2006 -0600
+++ b/buildconfigs/linux-defconfig_xen0_ia64    Wed May 10 15:52:06 2006 -0600
@@ -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 c3506e73b63e -r 1283874dff10 buildconfigs/linux-defconfig_xenU_ia64
--- a/buildconfigs/linux-defconfig_xenU_ia64    Wed May 10 15:50:27 2006 -0600
+++ b/buildconfigs/linux-defconfig_xenU_ia64    Wed May 10 15:52:06 2006 -0600
@@ -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 c3506e73b63e -r 1283874dff10 buildconfigs/linux-defconfig_xen_ia64
--- a/buildconfigs/linux-defconfig_xen_ia64     Wed May 10 15:50:27 2006 -0600
+++ b/buildconfigs/linux-defconfig_xen_ia64     Wed May 10 15:52:06 2006 -0600
@@ -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 c3506e73b63e -r 1283874dff10 linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig    Wed May 10 15:50:27 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig    Wed May 10 15:52:06 2006 -0600
@@ -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"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog