ia64/xen-unstable

changeset 3487:c60c0cc29ae0

bitkeeper revision 1.1159.212.26 (41f28aabyam1d9KxJTuTjomL3m7ZlA)

manual merge
author iap10@labyrinth.cl.cam.ac.uk
date Sat Jan 22 17:17:31 2005 +0000 (2005-01-22)
parents 4e64b8deb0d4 834cba8761c6
children 10d4d8627af0
files linux-2.6.10-xen-sparse/arch/xen/Kconfig
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/Kconfig	Sat Jan 22 15:52:51 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/Kconfig	Sat Jan 22 17:17:31 2005 +0000
     1.3 @@ -32,8 +32,7 @@ config XEN_PRIVILEGED_GUEST
     1.4  
     1.5  config XEN_PHYSDEV_ACCESS
     1.6  	bool "Physical device access"
     1.7 -	default y if XEN_PRIVILEGED_GUEST
     1.8 -	default n if !XEN_PRIVILEGED_GUEST
     1.9 +	default XEN_PRIVILEGED_GUEST
    1.10  	help
    1.11  	  Assume access is available to physical hardware devices
    1.12            (e.g., hard drives, network cards). This allows you to configure
    1.13 @@ -42,16 +41,16 @@ config XEN_PHYSDEV_ACCESS
    1.14  
    1.15  config XEN_BLKDEV_BACKEND
    1.16          bool "Block-device backend driver"
    1.17 -        default y if XEN_PHYSDEV_ACCESS
    1.18 -        default n if !XEN_PHYSDEV_ACCESS
    1.19 +      depends on XEN_PHYSDEV_ACCESS
    1.20 +        default y
    1.21          help
    1.22            The block-device backend driver allows the kernel to export its
    1.23            block devices to other guests via a high-performance shared-memory
    1.24            interface.
    1.25  
    1.26 -if XEN_BLKDEV_BACKEND
    1.27  config XEN_BLKDEV_TAP_BE
    1.28          bool "Block Tap support for backend driver (DANGEROUS)"
    1.29 +      depends on XEN_BLDEV_BACKEND
    1.30          default n
    1.31          help
    1.32            If you intend to use the block tap driver, the backend domain will
    1.33 @@ -61,12 +60,11 @@ config XEN_BLKDEV_TAP_BE
    1.34            security risk, and so should ONLY be used for development
    1.35            with the blktap.  This option will be removed as the block drivers are
    1.36            modified to use grant tables.
    1.37 -endif
    1.38  
    1.39  config XEN_NETDEV_BACKEND
    1.40          bool "Network-device backend driver"
    1.41 -        default y if XEN_PHYSDEV_ACCESS
    1.42 -        default n if !XEN_PHYSDEV_ACCESS
    1.43 +      depends on XEN_PHYSDEV_ACCESS
    1.44 +        default y
    1.45          help
    1.46            The network-device backend driver allows the kernel to export its
    1.47            network devices to other guests via a high-performance shared-memory
    1.48 @@ -90,9 +88,9 @@ config XEN_NETDEV_FRONTEND
    1.49            dedicated device-driver domain, or your master control domain
    1.50            (domain 0), then you almost certainly want to say Y here.
    1.51  
    1.52 -if XEN_NETDEV_FRONTEND
    1.53  config XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER
    1.54          bool "Pipelined transmitter (DANGEROUS)"
    1.55 +	depends on XEN_NETDEV_FRONTEND
    1.56          default n
    1.57          help
    1.58            The driver will assume that the backend is pipelining packets for
    1.59 @@ -106,7 +104,6 @@ config XEN_NETDEV_FRONTEND_PIPELINED_TRA
    1.60            like reassembling packets to perform firewall filtering; or if you
    1.61            are unsure; or if you experience network hangs when this option is
    1.62            enabled; then you must say N here.
    1.63 -endif
    1.64  
    1.65  config XEN_BLKDEV_TAP
    1.66          bool "Block device tap driver"
    1.67 @@ -133,40 +130,28 @@ config XEN_SCRUB_PAGES
    1.68            If security is not a concern then you may increase performance by
    1.69            saying N.
    1.70  
    1.71 +choice
    1.72 +        prompt "Processor Type"
    1.73 +        default X86
    1.74 +
    1.75 +config X86
    1.76 +        bool "X86"
    1.77 +        help
    1.78 +          Choose this option if your computer is a X86 architecture.
    1.79 +
    1.80 +config X86_64
    1.81 +        bool "X86_64"
    1.82 +        help
    1.83 +          Choose this option if your computer is a X86 architecture.
    1.84 +
    1.85 +endchoice
    1.86 +
    1.87  endmenu
    1.88  
    1.89  config HAVE_ARCH_DEV_ALLOC_SKB
    1.90  	bool
    1.91  	default y
    1.92  
    1.93 -#config VT
    1.94 -#	bool
    1.95 -#	default y
    1.96 -
    1.97 -#config VT_CONSOLE
    1.98 -#	bool
    1.99 -#	default y
   1.100 -
   1.101 -#config HW_CONSOLE
   1.102 -#	bool
   1.103 -#	default y
   1.104 -
   1.105 -choice
   1.106 -	prompt "Processor Type"
   1.107 -	default X86
   1.108 -
   1.109 -config X86
   1.110 -	bool "X86"
   1.111 -	help
   1.112 -	  Choose this option if your computer is a X86 architecture.
   1.113 -
   1.114 -config X86_64
   1.115 -	bool "X86_64"
   1.116 -	help
   1.117 -	  Choose this option if your computer is a X86 architecture.
   1.118 -
   1.119 -endchoice
   1.120 -
   1.121  source "init/Kconfig"
   1.122  
   1.123  if X86