1.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Wed May 10 15:50:27 2006 -0600
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Wed May 10 15:52:06 2006 -0600
     1.3 @@ -1523,3 +1523,19 @@ CONFIG_CRYPTO_DES=y
     1.4  #
     1.5  # Hardware crypto devices
     1.6  #
     1.7 +# CONFIG_NO_IDLE_HZ is not set
     1.8 +# CONFIG_XEN_PCIDEV_BACKEND is not set
     1.9 +# CONFIG_XEN_BLKDEV_TAP_BE is not set
    1.10 +# CONFIG_XEN_NETDEV_BACKEND is not set
    1.11 +# CONFIG_XEN_TPMDEV_BACKEND is not set
    1.12 +# CONFIG_XEN_NETDEV_FRONTEND is not set
    1.13 +# CONFIG_XEN_BLKDEV_TAP is not set
    1.14 +# CONFIG_XEN_SCRUB_PAGES is not set
    1.15 +# CONFIG_HAVE_ARCH_ALLOC_SKB is not set
    1.16 +# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set
    1.17 +
    1.18 +#
    1.19 +# XEN
    1.20 +#
    1.21 +# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
    1.22 +# CONFIG_XEN_DISABLE_SERIAL is not set

     2.1 --- a/buildconfigs/linux-defconfig_xenU_ia64	Wed May 10 15:50:27 2006 -0600
     2.2 +++ b/buildconfigs/linux-defconfig_xenU_ia64	Wed May 10 15:52:06 2006 -0600
     2.3 @@ -1387,3 +1387,19 @@ CONFIG_CRYPTO_DES=y
     2.4  #
     2.5  # Hardware crypto devices
     2.6  #
     2.7 +# CONFIG_NO_IDLE_HZ is not set
     2.8 +# CONFIG_XEN_PCIDEV_BACKEND is not set
     2.9 +# CONFIG_XEN_BLKDEV_TAP_BE is not set
    2.10 +# CONFIG_XEN_NETDEV_BACKEND is not set
    2.11 +# CONFIG_XEN_TPMDEV_BACKEND is not set
    2.12 +# CONFIG_XEN_NETDEV_FRONTEND is not set
    2.13 +# CONFIG_XEN_BLKDEV_TAP is not set
    2.14 +# CONFIG_XEN_SCRUB_PAGES is not set
    2.15 +# CONFIG_HAVE_ARCH_ALLOC_SKB is not set
    2.16 +# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set
    2.17 +
    2.18 +#
    2.19 +# XEN
    2.20 +#
    2.21 +# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
    2.22 +# CONFIG_XEN_DISABLE_SERIAL is not set

     3.1 --- a/buildconfigs/linux-defconfig_xen_ia64	Wed May 10 15:50:27 2006 -0600
     3.2 +++ b/buildconfigs/linux-defconfig_xen_ia64	Wed May 10 15:52:06 2006 -0600
     3.3 @@ -1529,3 +1529,19 @@ CONFIG_CRYPTO_DES=y
     3.4  #
     3.5  # Hardware crypto devices
     3.6  #
     3.7 +# CONFIG_NO_IDLE_HZ is not set
     3.8 +# CONFIG_XEN_PCIDEV_BACKEND is not set
     3.9 +# CONFIG_XEN_BLKDEV_TAP_BE is not set
    3.10 +# CONFIG_XEN_NETDEV_BACKEND is not set
    3.11 +# CONFIG_XEN_TPMDEV_BACKEND is not set
    3.12 +# CONFIG_XEN_NETDEV_FRONTEND is not set
    3.13 +# CONFIG_XEN_BLKDEV_TAP is not set
    3.14 +# CONFIG_XEN_SCRUB_PAGES is not set
    3.15 +# CONFIG_HAVE_ARCH_ALLOC_SKB is not set
    3.16 +# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set
    3.17 +
    3.18 +#
    3.19 +# XEN
    3.20 +#
    3.21 +# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
    3.22 +# CONFIG_XEN_DISABLE_SERIAL is not set

     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Wed May 10 15:50:27 2006 -0600
     4.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Wed May 10 15:52:06 2006 -0600
     4.3 @@ -63,32 +63,6 @@ config ARCH_XEN
     4.4  	help
     4.5  	  TEMP ONLY. Needs to be on for drivers/xen to build.
     4.6  
     4.7 -config XEN_PRIVILEGED_GUEST
     4.8 -	bool "Privileged Guest"
     4.9 -	default n
    4.10 -	help
    4.11 -	  Used in drivers/xen/privcmd.c.  Should go away?
    4.12 -
    4.13 -config XEN_BLKDEV_GRANT
    4.14 -	depends on XEN
    4.15 -	bool
    4.16 -	default y
    4.17 -
    4.18 -config XEN_BLKDEV_FRONTEND
    4.19 -	depends on XEN
    4.20 -	bool
    4.21 -	default y
    4.22 -
    4.23 -config XEN_BACKEND
    4.24 -	depends on XEN
    4.25 -	bool
    4.26 -	default y
    4.27 -
    4.28 -config XEN_BLKDEV_BACKEND
    4.29 -	depends on XEN && XEN_BACKEND
    4.30 -	bool
    4.31 -	default y
    4.32 -
    4.33  config XEN_IA64_DOM0_VP
    4.34  	bool "dom0 vp model"
    4.35  	depends on XEN
    4.36 @@ -103,18 +77,6 @@ config XEN_IA64_DOM0_NON_VP
    4.37  	help
    4.38  	  dom0 P=M model
    4.39  
    4.40 -config XEN_SYSFS
    4.41 -	bool "Export Xen attributes in sysfs"
    4.42 -	depends on XEN && SYSFS
    4.43 -	default y
    4.44 -	help
    4.45 -		Xen hypervisor attributes will show up under /sys/hypervisor/.
    4.46 -
    4.47 -config XEN_INTERFACE_VERSION
    4.48 -	hex
    4.49 -	depends on XEN
    4.50 -	default 0x00030202
    4.51 -
    4.52  config SCHED_NO_NO_OMIT_FRAME_POINTER
    4.53  	bool
    4.54  	default y
    4.55 @@ -532,3 +494,16 @@ source "arch/ia64/Kconfig.debug"
    4.56  source "security/Kconfig"
    4.57  
    4.58  source "crypto/Kconfig"
    4.59 +
    4.60 +# override default values of drivers/xen/Kconfig
    4.61 +if !XEN_IA64_DOM0_VP
    4.62 +config HAVE_ARCH_ALLOC_SKB
    4.63 +        bool
    4.64 +        default n
    4.65 +
    4.66 +config HAVE_ARCH_DEV_ALLOC_SKB
    4.67 +        bool
    4.68 +        default n
    4.69 +endif
    4.70 +
    4.71 +source "drivers/xen/Kconfig"