ia64/xen-unstable

changeset 8772:55268b90a519

Remove the PHYSDEV_ACCESS configure option from Linux.
It saves very little space, no distro will disable it
in their unified build, and it's rather a pain to
implement it properly.

I've left the PRIVILEGED_GUEST option for now, as it
provides some indication of where our platform-bringup
hacks are in our Linux tree. We may wish to exclude
those from upstream merge in the first instance.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Feb 07 01:02:49 2006 +0100 (2006-02-07)
parents 707cb68a391f
children 87a83b44930b
files buildconfigs/linux-defconfig_xen0_ia64 buildconfigs/linux-defconfig_xen0_x86_32 buildconfigs/linux-defconfig_xen0_x86_64 buildconfigs/linux-defconfig_xenU_ia64 buildconfigs/linux-defconfig_xenU_x86_32 buildconfigs/linux-defconfig_xenU_x86_64 buildconfigs/linux-defconfig_xen_x86_32 buildconfigs/linux-defconfig_xen_x86_64 linux-2.6-xen-sparse/arch/i386/Kconfig linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c linux-2.6-xen-sparse/arch/i386/mm/init-xen.c linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c linux-2.6-xen-sparse/arch/ia64/Kconfig linux-2.6-xen-sparse/arch/x86_64/Kconfig linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c linux-2.6-xen-sparse/drivers/xen/Kconfig linux-2.6-xen-sparse/drivers/xen/console/console.c linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/io.h linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/io.h
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Mon Feb 06 23:33:58 2006 +0100
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Tue Feb 07 01:02:49 2006 +0100
     1.3 @@ -94,7 +94,6 @@ CONFIG_GENERIC_IOMAP=y
     1.4  CONFIG_XEN=y
     1.5  CONFIG_ARCH_XEN=y
     1.6  CONFIG_XEN_PRIVILEGED_GUEST=y
     1.7 -CONFIG_XEN_PHYSDEV_ACCESS=y
     1.8  CONFIG_XEN_BLKDEV_GRANT=y
     1.9  CONFIG_XEN_BLKDEV_FRONTEND=y
    1.10  CONFIG_XEN_VT=y
     2.1 --- a/buildconfigs/linux-defconfig_xen0_x86_32	Mon Feb 06 23:33:58 2006 +0100
     2.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_32	Tue Feb 07 01:02:49 2006 +0100
     2.3 @@ -1308,7 +1308,6 @@ CONFIG_NO_IDLE_HZ=y
     2.4  #
     2.5  CONFIG_XEN_PRIVILEGED_GUEST=y
     2.6  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
     2.7 -CONFIG_XEN_PHYSDEV_ACCESS=y
     2.8  CONFIG_XEN_BLKDEV_BACKEND=y
     2.9  # CONFIG_XEN_BLKDEV_TAP_BE is not set
    2.10  CONFIG_XEN_NETDEV_BACKEND=y
     3.1 --- a/buildconfigs/linux-defconfig_xen0_x86_64	Mon Feb 06 23:33:58 2006 +0100
     3.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_64	Tue Feb 07 01:02:49 2006 +0100
     3.3 @@ -1233,7 +1233,6 @@ CONFIG_NO_IDLE_HZ=y
     3.4  #
     3.5  CONFIG_XEN_PRIVILEGED_GUEST=y
     3.6  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
     3.7 -CONFIG_XEN_PHYSDEV_ACCESS=y
     3.8  CONFIG_XEN_BLKDEV_BACKEND=y
     3.9  # CONFIG_XEN_BLKDEV_TAP_BE is not set
    3.10  CONFIG_XEN_NETDEV_BACKEND=y
     4.1 --- a/buildconfigs/linux-defconfig_xenU_ia64	Mon Feb 06 23:33:58 2006 +0100
     4.2 +++ b/buildconfigs/linux-defconfig_xenU_ia64	Tue Feb 07 01:02:49 2006 +0100
     4.3 @@ -93,7 +93,6 @@ CONFIG_GENERIC_IOMAP=y
     4.4  CONFIG_XEN=y
     4.5  CONFIG_ARCH_XEN=y
     4.6  CONFIG_XEN_PRIVILEGED_GUEST=y
     4.7 -CONFIG_XEN_PHYSDEV_ACCESS=y
     4.8  CONFIG_XEN_BLKDEV_GRANT=y
     4.9  CONFIG_XEN_BLKDEV_FRONTEND=y
    4.10  # CONFIG_XEN_VT is not set
     5.1 --- a/buildconfigs/linux-defconfig_xenU_x86_32	Mon Feb 06 23:33:58 2006 +0100
     5.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_32	Tue Feb 07 01:02:49 2006 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  #
     5.5  # Automatically generated make config: don't edit
     5.6  # Linux kernel version: 2.6.16-rc2-xenU
     5.7 -# Mon Feb  6 13:25:40 2006
     5.8 +# Mon Feb  6 23:16:07 2006
     5.9  #
    5.10  CONFIG_X86_32=y
    5.11  CONFIG_SEMAPHORE_SLEEPERS=y
    5.12 @@ -149,7 +149,7 @@ CONFIG_PREEMPT_BKL=y
    5.13  # CONFIG_I8K is not set
    5.14  # CONFIG_X86_REBOOTFIXUPS is not set
    5.15  CONFIG_X86_CPUID=y
    5.16 -# CONFIG_SWIOTLB is not set
    5.17 +CONFIG_SWIOTLB=y
    5.18  
    5.19  #
    5.20  # Firmware Drivers
    5.21 @@ -184,6 +184,21 @@ CONFIG_PHYSICAL_START=0x100000
    5.22  CONFIG_HOTPLUG_CPU=y
    5.23  
    5.24  #
    5.25 +# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
    5.26 +#
    5.27 +# CONFIG_PCI is not set
    5.28 +# CONFIG_SCx200 is not set
    5.29 +
    5.30 +#
    5.31 +# PCCARD (PCMCIA/CardBus) support
    5.32 +#
    5.33 +# CONFIG_PCCARD is not set
    5.34 +
    5.35 +#
    5.36 +# PCI Hotplug Support
    5.37 +#
    5.38 +
    5.39 +#
    5.40  # Executable file formats
    5.41  #
    5.42  CONFIG_BINFMT_ELF=y
    5.43 @@ -278,6 +293,25 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
    5.44  # CONFIG_DEBUG_DRIVER is not set
    5.45  
    5.46  #
    5.47 +# Connector - unified userspace <-> kernelspace linker
    5.48 +#
    5.49 +# CONFIG_CONNECTOR is not set
    5.50 +
    5.51 +#
    5.52 +# Memory Technology Devices (MTD)
    5.53 +#
    5.54 +# CONFIG_MTD is not set
    5.55 +
    5.56 +#
    5.57 +# Parallel port support
    5.58 +#
    5.59 +# CONFIG_PARPORT is not set
    5.60 +
    5.61 +#
    5.62 +# Plug and Play support
    5.63 +#
    5.64 +
    5.65 +#
    5.66  # Block devices
    5.67  #
    5.68  # CONFIG_BLK_DEV_FD is not set
    5.69 @@ -293,6 +327,11 @@ CONFIG_BLK_DEV_INITRD=y
    5.70  # CONFIG_ATA_OVER_ETH is not set
    5.71  
    5.72  #
    5.73 +# ATA/ATAPI/MFM/RLL support
    5.74 +#
    5.75 +# CONFIG_IDE is not set
    5.76 +
    5.77 +#
    5.78  # SCSI device support
    5.79  #
    5.80  # CONFIG_RAID_ATTRS is not set
    5.81 @@ -337,6 +376,19 @@ CONFIG_BLK_DEV_SD=m
    5.82  # CONFIG_MD is not set
    5.83  
    5.84  #
    5.85 +# Fusion MPT device support
    5.86 +#
    5.87 +# CONFIG_FUSION is not set
    5.88 +
    5.89 +#
    5.90 +# IEEE 1394 (FireWire) support
    5.91 +#
    5.92 +
    5.93 +#
    5.94 +# I2O device support
    5.95 +#
    5.96 +
    5.97 +#
    5.98  # Network device support
    5.99  #
   5.100  CONFIG_NETDEVICES=y
   5.101 @@ -381,11 +433,189 @@ CONFIG_NETDEVICES=y
   5.102  # CONFIG_NETCONSOLE is not set
   5.103  # CONFIG_NETPOLL is not set
   5.104  # CONFIG_NET_POLL_CONTROLLER is not set
   5.105 +
   5.106 +#
   5.107 +# ISDN subsystem
   5.108 +#
   5.109 +# CONFIG_ISDN is not set
   5.110 +
   5.111 +#
   5.112 +# Telephony Support
   5.113 +#
   5.114 +# CONFIG_PHONE is not set
   5.115 +
   5.116 +#
   5.117 +# Input device support
   5.118 +#
   5.119 +CONFIG_INPUT=y
   5.120 +
   5.121 +#
   5.122 +# Userland interfaces
   5.123 +#
   5.124 +CONFIG_INPUT_MOUSEDEV=y
   5.125 +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
   5.126 +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
   5.127 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
   5.128 +# CONFIG_INPUT_JOYDEV is not set
   5.129 +# CONFIG_INPUT_TSDEV is not set
   5.130 +# CONFIG_INPUT_EVDEV is not set
   5.131 +# CONFIG_INPUT_EVBUG is not set
   5.132 +
   5.133 +#
   5.134 +# Input Device Drivers
   5.135 +#
   5.136 +CONFIG_INPUT_KEYBOARD=y
   5.137 +# CONFIG_KEYBOARD_ATKBD is not set
   5.138 +# CONFIG_KEYBOARD_SUNKBD is not set
   5.139 +# CONFIG_KEYBOARD_LKKBD is not set
   5.140 +# CONFIG_KEYBOARD_XTKBD is not set
   5.141 +# CONFIG_KEYBOARD_NEWTON is not set
   5.142 +# CONFIG_INPUT_MOUSE is not set
   5.143 +# CONFIG_INPUT_JOYSTICK is not set
   5.144 +# CONFIG_INPUT_TOUCHSCREEN is not set
   5.145 +# CONFIG_INPUT_MISC is not set
   5.146 +
   5.147 +#
   5.148 +# Hardware I/O ports
   5.149 +#
   5.150 +CONFIG_SERIO=y
   5.151 +CONFIG_SERIO_I8042=y
   5.152 +CONFIG_SERIO_SERPORT=y
   5.153 +# CONFIG_SERIO_CT82C710 is not set
   5.154 +# CONFIG_SERIO_RAW is not set
   5.155 +# CONFIG_GAMEPORT is not set
   5.156 +
   5.157 +#
   5.158 +# Character devices
   5.159 +#
   5.160 +CONFIG_VT=y
   5.161 +CONFIG_VT_CONSOLE=y
   5.162 +CONFIG_HW_CONSOLE=y
   5.163 +# CONFIG_SERIAL_NONSTANDARD is not set
   5.164 +
   5.165 +#
   5.166 +# Serial drivers
   5.167 +#
   5.168 +
   5.169 +#
   5.170 +# Non-8250 serial port support
   5.171 +#
   5.172  CONFIG_UNIX98_PTYS=y
   5.173  CONFIG_LEGACY_PTYS=y
   5.174  CONFIG_LEGACY_PTY_COUNT=256
   5.175  
   5.176  #
   5.177 +# IPMI
   5.178 +#
   5.179 +# CONFIG_IPMI_HANDLER is not set
   5.180 +
   5.181 +#
   5.182 +# Watchdog Cards
   5.183 +#
   5.184 +# CONFIG_WATCHDOG is not set
   5.185 +# CONFIG_NVRAM is not set
   5.186 +# CONFIG_RTC is not set
   5.187 +# CONFIG_GEN_RTC is not set
   5.188 +# CONFIG_DTLK is not set
   5.189 +# CONFIG_R3964 is not set
   5.190 +
   5.191 +#
   5.192 +# Ftape, the floppy tape device driver
   5.193 +#
   5.194 +# CONFIG_AGP is not set
   5.195 +# CONFIG_MWAVE is not set
   5.196 +# CONFIG_CS5535_GPIO is not set
   5.197 +# CONFIG_RAW_DRIVER is not set
   5.198 +# CONFIG_HANGCHECK_TIMER is not set
   5.199 +
   5.200 +#
   5.201 +# TPM devices
   5.202 +#
   5.203 +# CONFIG_TCG_TPM is not set
   5.204 +# CONFIG_TELCLOCK is not set
   5.205 +
   5.206 +#
   5.207 +# I2C support
   5.208 +#
   5.209 +# CONFIG_I2C is not set
   5.210 +
   5.211 +#
   5.212 +# SPI support
   5.213 +#
   5.214 +# CONFIG_SPI is not set
   5.215 +# CONFIG_SPI_MASTER is not set
   5.216 +
   5.217 +#
   5.218 +# Dallas's 1-wire bus
   5.219 +#
   5.220 +# CONFIG_W1 is not set
   5.221 +
   5.222 +#
   5.223 +# Hardware Monitoring support
   5.224 +#
   5.225 +# CONFIG_HWMON is not set
   5.226 +# CONFIG_HWMON_VID is not set
   5.227 +
   5.228 +#
   5.229 +# Misc devices
   5.230 +#
   5.231 +
   5.232 +#
   5.233 +# Multimedia Capabilities Port drivers
   5.234 +#
   5.235 +
   5.236 +#
   5.237 +# Multimedia devices
   5.238 +#
   5.239 +# CONFIG_VIDEO_DEV is not set
   5.240 +
   5.241 +#
   5.242 +# Digital Video Broadcasting Devices
   5.243 +#
   5.244 +# CONFIG_DVB is not set
   5.245 +
   5.246 +#
   5.247 +# Graphics support
   5.248 +#
   5.249 +# CONFIG_FB is not set
   5.250 +# CONFIG_VIDEO_SELECT is not set
   5.251 +
   5.252 +#
   5.253 +# Console display driver support
   5.254 +#
   5.255 +CONFIG_VGA_CONSOLE=y
   5.256 +CONFIG_DUMMY_CONSOLE=y
   5.257 +
   5.258 +#
   5.259 +# Sound
   5.260 +#
   5.261 +# CONFIG_SOUND is not set
   5.262 +
   5.263 +#
   5.264 +# USB support
   5.265 +#
   5.266 +# CONFIG_USB_ARCH_HAS_HCD is not set
   5.267 +# CONFIG_USB_ARCH_HAS_OHCI is not set
   5.268 +
   5.269 +#
   5.270 +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
   5.271 +#
   5.272 +
   5.273 +#
   5.274 +# USB Gadget Support
   5.275 +#
   5.276 +# CONFIG_USB_GADGET is not set
   5.277 +
   5.278 +#
   5.279 +# MMC/SD Card support
   5.280 +#
   5.281 +# CONFIG_MMC is not set
   5.282 +
   5.283 +#
   5.284 +# InfiniBand support
   5.285 +#
   5.286 +
   5.287 +#
   5.288  # SN Devices
   5.289  #
   5.290  
   5.291 @@ -627,6 +857,9 @@ CONFIG_NO_IDLE_HZ=y
   5.292  #
   5.293  # CONFIG_XEN_PRIVILEGED_GUEST is not set
   5.294  CONFIG_XEN_UNPRIVILEGED_GUEST=y
   5.295 +# CONFIG_XEN_BLKDEV_BACKEND is not set
   5.296 +# CONFIG_XEN_NETDEV_BACKEND is not set
   5.297 +# CONFIG_XEN_TPMDEV_BACKEND is not set
   5.298  CONFIG_XEN_BLKDEV_FRONTEND=y
   5.299  CONFIG_XEN_NETDEV_FRONTEND=y
   5.300  # CONFIG_XEN_BLKDEV_TAP is not set
     6.1 --- a/buildconfigs/linux-defconfig_xenU_x86_64	Mon Feb 06 23:33:58 2006 +0100
     6.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_64	Tue Feb 07 01:02:49 2006 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  #
     6.5  # Automatically generated make config: don't edit
     6.6  # Linux kernel version: 2.6.16-rc2-xenU
     6.7 -# Fri Feb  3 16:30:13 2006
     6.8 +# Mon Feb  6 23:49:06 2006
     6.9  #
    6.10  CONFIG_X86_64=y
    6.11  CONFIG_64BIT=y
    6.12 @@ -128,6 +128,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
    6.13  CONFIG_SPLIT_PTLOCK_CPUS=4096
    6.14  CONFIG_NR_CPUS=8
    6.15  # CONFIG_HOTPLUG_CPU is not set
    6.16 +CONFIG_SWIOTLB=y
    6.17  # CONFIG_CRASH_DUMP is not set
    6.18  CONFIG_PHYSICAL_START=0x100000
    6.19  CONFIG_SECCOMP=y
    6.20 @@ -478,6 +479,25 @@ CONFIG_FW_LOADER=y
    6.21  # CONFIG_DEBUG_DRIVER is not set
    6.22  
    6.23  #
    6.24 +# Connector - unified userspace <-> kernelspace linker
    6.25 +#
    6.26 +# CONFIG_CONNECTOR is not set
    6.27 +
    6.28 +#
    6.29 +# Memory Technology Devices (MTD)
    6.30 +#
    6.31 +# CONFIG_MTD is not set
    6.32 +
    6.33 +#
    6.34 +# Parallel port support
    6.35 +#
    6.36 +# CONFIG_PARPORT is not set
    6.37 +
    6.38 +#
    6.39 +# Plug and Play support
    6.40 +#
    6.41 +
    6.42 +#
    6.43  # Block devices
    6.44  #
    6.45  CONFIG_BLK_DEV_FD=m
    6.46 @@ -493,6 +513,11 @@ CONFIG_BLK_DEV_INITRD=y
    6.47  # CONFIG_ATA_OVER_ETH is not set
    6.48  
    6.49  #
    6.50 +# ATA/ATAPI/MFM/RLL support
    6.51 +#
    6.52 +# CONFIG_IDE is not set
    6.53 +
    6.54 +#
    6.55  # SCSI device support
    6.56  #
    6.57  # CONFIG_RAID_ATTRS is not set
    6.58 @@ -553,6 +578,19 @@ CONFIG_DM_ZERO=m
    6.59  # CONFIG_DM_MULTIPATH is not set
    6.60  
    6.61  #
    6.62 +# Fusion MPT device support
    6.63 +#
    6.64 +# CONFIG_FUSION is not set
    6.65 +
    6.66 +#
    6.67 +# IEEE 1394 (FireWire) support
    6.68 +#
    6.69 +
    6.70 +#
    6.71 +# I2O device support
    6.72 +#
    6.73 +
    6.74 +#
    6.75  # Network device support
    6.76  #
    6.77  CONFIG_NETDEVICES=y
    6.78 @@ -600,9 +638,6 @@ CONFIG_ATMEL=m
    6.79  # Wan interfaces
    6.80  #
    6.81  # CONFIG_WAN is not set
    6.82 -CONFIG_UNIX98_PTYS=y
    6.83 -CONFIG_LEGACY_PTYS=y
    6.84 -CONFIG_LEGACY_PTY_COUNT=256
    6.85  
    6.86  #
    6.87  # ATM drivers
    6.88 @@ -626,7 +661,187 @@ CONFIG_NETPOLL=y
    6.89  # CONFIG_NETPOLL_RX is not set
    6.90  CONFIG_NETPOLL_TRAP=y
    6.91  CONFIG_NET_POLL_CONTROLLER=y
    6.92 -CONFIG_INPUT=m
    6.93 +
    6.94 +#
    6.95 +# ISDN subsystem
    6.96 +#
    6.97 +# CONFIG_ISDN is not set
    6.98 +
    6.99 +#
   6.100 +# Telephony Support
   6.101 +#
   6.102 +# CONFIG_PHONE is not set
   6.103 +
   6.104 +#
   6.105 +# Input device support
   6.106 +#
   6.107 +CONFIG_INPUT=y
   6.108 +
   6.109 +#
   6.110 +# Userland interfaces
   6.111 +#
   6.112 +CONFIG_INPUT_MOUSEDEV=y
   6.113 +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
   6.114 +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
   6.115 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
   6.116 +# CONFIG_INPUT_JOYDEV is not set
   6.117 +# CONFIG_INPUT_TSDEV is not set
   6.118 +# CONFIG_INPUT_EVDEV is not set
   6.119 +# CONFIG_INPUT_EVBUG is not set
   6.120 +
   6.121 +#
   6.122 +# Input Device Drivers
   6.123 +#
   6.124 +CONFIG_INPUT_KEYBOARD=y
   6.125 +CONFIG_KEYBOARD_ATKBD=y
   6.126 +# CONFIG_KEYBOARD_SUNKBD is not set
   6.127 +# CONFIG_KEYBOARD_LKKBD is not set
   6.128 +# CONFIG_KEYBOARD_XTKBD is not set
   6.129 +# CONFIG_KEYBOARD_NEWTON is not set
   6.130 +# CONFIG_INPUT_MOUSE is not set
   6.131 +# CONFIG_INPUT_JOYSTICK is not set
   6.132 +# CONFIG_INPUT_TOUCHSCREEN is not set
   6.133 +# CONFIG_INPUT_MISC is not set
   6.134 +
   6.135 +#
   6.136 +# Hardware I/O ports
   6.137 +#
   6.138 +CONFIG_SERIO=y
   6.139 +CONFIG_SERIO_I8042=y
   6.140 +CONFIG_SERIO_SERPORT=y
   6.141 +# CONFIG_SERIO_CT82C710 is not set
   6.142 +CONFIG_SERIO_LIBPS2=y
   6.143 +# CONFIG_SERIO_RAW is not set
   6.144 +# CONFIG_GAMEPORT is not set
   6.145 +
   6.146 +#
   6.147 +# Character devices
   6.148 +#
   6.149 +CONFIG_VT=y
   6.150 +CONFIG_VT_CONSOLE=y
   6.151 +CONFIG_HW_CONSOLE=y
   6.152 +# CONFIG_SERIAL_NONSTANDARD is not set
   6.153 +
   6.154 +#
   6.155 +# Serial drivers
   6.156 +#
   6.157 +
   6.158 +#
   6.159 +# Non-8250 serial port support
   6.160 +#
   6.161 +CONFIG_UNIX98_PTYS=y
   6.162 +CONFIG_LEGACY_PTYS=y
   6.163 +CONFIG_LEGACY_PTY_COUNT=256
   6.164 +
   6.165 +#
   6.166 +# IPMI
   6.167 +#
   6.168 +# CONFIG_IPMI_HANDLER is not set
   6.169 +
   6.170 +#
   6.171 +# Watchdog Cards
   6.172 +#
   6.173 +# CONFIG_WATCHDOG is not set
   6.174 +# CONFIG_NVRAM is not set
   6.175 +# CONFIG_RTC is not set
   6.176 +# CONFIG_GEN_RTC is not set
   6.177 +# CONFIG_DTLK is not set
   6.178 +# CONFIG_R3964 is not set
   6.179 +
   6.180 +#
   6.181 +# Ftape, the floppy tape device driver
   6.182 +#
   6.183 +# CONFIG_AGP is not set
   6.184 +# CONFIG_MWAVE is not set
   6.185 +# CONFIG_RAW_DRIVER is not set
   6.186 +# CONFIG_HANGCHECK_TIMER is not set
   6.187 +
   6.188 +#
   6.189 +# TPM devices
   6.190 +#
   6.191 +# CONFIG_TCG_TPM is not set
   6.192 +# CONFIG_TELCLOCK is not set
   6.193 +
   6.194 +#
   6.195 +# I2C support
   6.196 +#
   6.197 +# CONFIG_I2C is not set
   6.198 +
   6.199 +#
   6.200 +# SPI support
   6.201 +#
   6.202 +# CONFIG_SPI is not set
   6.203 +# CONFIG_SPI_MASTER is not set
   6.204 +
   6.205 +#
   6.206 +# Dallas's 1-wire bus
   6.207 +#
   6.208 +# CONFIG_W1 is not set
   6.209 +
   6.210 +#
   6.211 +# Hardware Monitoring support
   6.212 +#
   6.213 +# CONFIG_HWMON is not set
   6.214 +# CONFIG_HWMON_VID is not set
   6.215 +
   6.216 +#
   6.217 +# Misc devices
   6.218 +#
   6.219 +
   6.220 +#
   6.221 +# Multimedia Capabilities Port drivers
   6.222 +#
   6.223 +
   6.224 +#
   6.225 +# Multimedia devices
   6.226 +#
   6.227 +# CONFIG_VIDEO_DEV is not set
   6.228 +
   6.229 +#
   6.230 +# Digital Video Broadcasting Devices
   6.231 +#
   6.232 +# CONFIG_DVB is not set
   6.233 +
   6.234 +#
   6.235 +# Graphics support
   6.236 +#
   6.237 +# CONFIG_FB is not set
   6.238 +# CONFIG_VIDEO_SELECT is not set
   6.239 +
   6.240 +#
   6.241 +# Console display driver support
   6.242 +#
   6.243 +CONFIG_VGA_CONSOLE=y
   6.244 +CONFIG_DUMMY_CONSOLE=y
   6.245 +
   6.246 +#
   6.247 +# Sound
   6.248 +#
   6.249 +# CONFIG_SOUND is not set
   6.250 +
   6.251 +#
   6.252 +# USB support
   6.253 +#
   6.254 +# CONFIG_USB_ARCH_HAS_HCD is not set
   6.255 +# CONFIG_USB_ARCH_HAS_OHCI is not set
   6.256 +
   6.257 +#
   6.258 +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
   6.259 +#
   6.260 +
   6.261 +#
   6.262 +# USB Gadget Support
   6.263 +#
   6.264 +# CONFIG_USB_GADGET is not set
   6.265 +
   6.266 +#
   6.267 +# MMC/SD Card support
   6.268 +#
   6.269 +# CONFIG_MMC is not set
   6.270 +
   6.271 +#
   6.272 +# InfiniBand support
   6.273 +#
   6.274  
   6.275  #
   6.276  # SN Devices
   6.277 @@ -920,6 +1135,9 @@ CONFIG_NO_IDLE_HZ=y
   6.278  #
   6.279  # CONFIG_XEN_PRIVILEGED_GUEST is not set
   6.280  CONFIG_XEN_UNPRIVILEGED_GUEST=y
   6.281 +# CONFIG_XEN_BLKDEV_BACKEND is not set
   6.282 +# CONFIG_XEN_NETDEV_BACKEND is not set
   6.283 +# CONFIG_XEN_TPMDEV_BACKEND is not set
   6.284  CONFIG_XEN_BLKDEV_FRONTEND=y
   6.285  CONFIG_XEN_NETDEV_FRONTEND=y
   6.286  # CONFIG_XEN_BLKDEV_TAP is not set
     7.1 --- a/buildconfigs/linux-defconfig_xen_x86_32	Mon Feb 06 23:33:58 2006 +0100
     7.2 +++ b/buildconfigs/linux-defconfig_xen_x86_32	Tue Feb 07 01:02:49 2006 +0100
     7.3 @@ -2990,7 +2990,6 @@ CONFIG_NO_IDLE_HZ=y
     7.4  #
     7.5  CONFIG_XEN_PRIVILEGED_GUEST=y
     7.6  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
     7.7 -CONFIG_XEN_PHYSDEV_ACCESS=y
     7.8  CONFIG_XEN_BLKDEV_BACKEND=y
     7.9  # CONFIG_XEN_BLKDEV_TAP_BE is not set
    7.10  CONFIG_XEN_NETDEV_BACKEND=y
     8.1 --- a/buildconfigs/linux-defconfig_xen_x86_64	Mon Feb 06 23:33:58 2006 +0100
     8.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64	Tue Feb 07 01:02:49 2006 +0100
     8.3 @@ -2665,7 +2665,6 @@ CONFIG_NO_IDLE_HZ=y
     8.4  #
     8.5  CONFIG_XEN_PRIVILEGED_GUEST=y
     8.6  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
     8.7 -CONFIG_XEN_PHYSDEV_ACCESS=y
     8.8  CONFIG_XEN_BLKDEV_BACKEND=y
     8.9  # CONFIG_XEN_BLKDEV_TAP_BE is not set
    8.10  CONFIG_XEN_NETDEV_BACKEND=y
     9.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig	Mon Feb 06 23:33:58 2006 +0100
     9.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig	Tue Feb 07 01:02:49 2006 +0100
     9.3 @@ -62,7 +62,7 @@ config X86_XEN
     9.4  	bool "Xen-compatible"
     9.5  	select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
     9.6  	select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST
     9.7 -	select SWIOTLB if XEN_PHYSDEV_ACCESS
     9.8 +	select SWIOTLB
     9.9  	help
    9.10  	  Choose this option is you plan to run this kernel on top of Xen
    9.11  	  Hypervisor.
    9.12 @@ -951,7 +951,6 @@ source "arch/i386/kernel/cpu/cpufreq/Kco
    9.13  endmenu
    9.14  
    9.15  menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
    9.16 -	depends on !XEN_UNPRIVILEGED_GUEST
    9.17  
    9.18  config PCI
    9.19  	bool "PCI support" if !X86_VISWS
    10.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Mon Feb 06 23:33:58 2006 +0100
    10.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Tue Feb 07 01:02:49 2006 +0100
    10.3 @@ -1678,7 +1678,6 @@ void __init setup_arch(char **cmdline_p)
    10.4  	}
    10.5  	bootloader_type = LOADER_TYPE;
    10.6  
    10.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    10.8  	if (xen_start_info->flags & SIF_INITDOMAIN) {
    10.9  		/* This is drawn from a dump from vgacon:startup in
   10.10  		 * standard Linux. */
   10.11 @@ -1690,9 +1689,6 @@ void __init setup_arch(char **cmdline_p)
   10.12  		screen_info.orig_video_points = 16;
   10.13  	} else
   10.14  		screen_info.orig_video_isVGA = 0;
   10.15 -#else
   10.16 -	screen_info.orig_video_isVGA = 0;
   10.17 -#endif
   10.18  
   10.19  #ifdef CONFIG_BLK_DEV_RAM
   10.20  	rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
   10.21 @@ -1869,7 +1865,6 @@ void __init setup_arch(char **cmdline_p)
   10.22  #endif
   10.23  #endif
   10.24  	} else {
   10.25 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
   10.26  		extern const struct consw xennull_con;
   10.27  		extern int console_use_vt;
   10.28  #if defined(CONFIG_VGA_CONSOLE)
   10.29 @@ -1878,7 +1873,6 @@ void __init setup_arch(char **cmdline_p)
   10.30  #endif
   10.31  		conswitchp = &xennull_con;
   10.32  		console_use_vt = 0;
   10.33 -#endif
   10.34  	}
   10.35  }
   10.36  
    11.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c	Mon Feb 06 23:33:58 2006 +0100
    11.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c	Tue Feb 07 01:02:49 2006 +0100
    11.3 @@ -531,9 +531,7 @@ out:
    11.4   */
    11.5  void __init paging_init(void)
    11.6  {
    11.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    11.8  	int i;
    11.9 -#endif
   11.10  
   11.11  #ifdef CONFIG_X86_PAE
   11.12  	set_nx();
   11.13 @@ -562,7 +560,6 @@ void __init paging_init(void)
   11.14  	HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
   11.15  	memset(empty_zero_page, 0, sizeof(empty_zero_page));
   11.16  
   11.17 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
   11.18  	/* Setup mapping of lower 1st MB */
   11.19  	for (i = 0; i < NR_FIX_ISAMAPS; i++)
   11.20  		if (xen_start_info->flags & SIF_PRIVILEGED)
   11.21 @@ -571,7 +568,6 @@ void __init paging_init(void)
   11.22  			__set_fixmap(FIX_ISAMAP_BEGIN - i,
   11.23  				     virt_to_machine(empty_zero_page),
   11.24  				     PAGE_KERNEL_RO);
   11.25 -#endif
   11.26  }
   11.27  
   11.28  /*
    12.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c	Mon Feb 06 23:33:58 2006 +0100
    12.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c	Tue Feb 07 01:02:49 2006 +0100
    12.3 @@ -172,8 +172,6 @@ int touch_pte_range(struct mm_struct *mm
    12.4  
    12.5  EXPORT_SYMBOL(touch_pte_range);
    12.6  
    12.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    12.8 -
    12.9  /*
   12.10   * Does @address reside within a non-highmem page that is local to this virtual
   12.11   * machine (i.e., not an I/O page, nor a memory page belonging to another VM).
   12.12 @@ -450,38 +448,6 @@ void __init bt_iounmap(void *addr, unsig
   12.13  
   12.14  #endif /* __i386__ */
   12.15  
   12.16 -#else /* CONFIG_XEN_PHYSDEV_ACCESS */
   12.17 -
   12.18 -void __iomem * __ioremap(unsigned long phys_addr, unsigned long size,
   12.19 -			 unsigned long flags)
   12.20 -{
   12.21 -	return NULL;
   12.22 -}
   12.23 -
   12.24 -void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size)
   12.25 -{
   12.26 -	return NULL;
   12.27 -}
   12.28 -
   12.29 -void iounmap(volatile void __iomem *addr)
   12.30 -{
   12.31 -}
   12.32 -
   12.33 -#ifdef __i386__
   12.34 -
   12.35 -void __init *bt_ioremap(unsigned long phys_addr, unsigned long size)
   12.36 -{
   12.37 -	return NULL;
   12.38 -}
   12.39 -
   12.40 -void __init bt_iounmap(void *addr, unsigned long size)
   12.41 -{
   12.42 -}
   12.43 -
   12.44 -#endif /* __i386__ */
   12.45 -
   12.46 -#endif /* CONFIG_XEN_PHYSDEV_ACCESS */
   12.47 -
   12.48  /*
   12.49   * Local variables:
   12.50   *  c-file-style: "linux"
    13.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Mon Feb 06 23:33:58 2006 +0100
    13.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Tue Feb 07 01:02:49 2006 +0100
    13.3 @@ -69,11 +69,6 @@ config XEN_PRIVILEGED_GUEST
    13.4  	help
    13.5  	  Used in drivers/xen/privcmd.c.  Should go away?
    13.6  
    13.7 -config XEN_PHYSDEV_ACCESS
    13.8 -	depends on XEN
    13.9 -	bool
   13.10 -	default y
   13.11 -
   13.12  config XEN_BLKDEV_GRANT
   13.13  	depends on XEN
   13.14  	bool
    14.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Mon Feb 06 23:33:58 2006 +0100
    14.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Tue Feb 07 01:02:49 2006 +0100
    14.3 @@ -121,7 +121,7 @@ endchoice
    14.4  
    14.5  config X86_64_XEN
    14.6  	bool "Enable Xen compatible kernel"
    14.7 -	select SWIOTLB if XEN_PHYSDEV_ACCESS
    14.8 +	select SWIOTLB
    14.9  	help
   14.10  	  This option will compile a kernel compatible with Xen hypervisor
   14.11  
    15.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Mon Feb 06 23:33:58 2006 +0100
    15.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Feb 07 01:02:49 2006 +0100
    15.3 @@ -630,7 +630,6 @@ void __init setup_arch(char **cmdline_p)
    15.4   	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0); 
    15.5   	drive_info = DRIVE_INFO;
    15.6  	kernel_end = 0;		/* dummy */
    15.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    15.8   	screen_info = SCREEN_INFO;
    15.9  
   15.10  	if (xen_start_info->flags & SIF_INITDOMAIN) {
   15.11 @@ -644,9 +643,7 @@ void __init setup_arch(char **cmdline_p)
   15.12  		screen_info.orig_video_points = 16;
   15.13  	} else
   15.14  		screen_info.orig_video_isVGA = 0;
   15.15 -#else
   15.16 -	screen_info.orig_video_isVGA = 0;
   15.17 -#endif
   15.18 +
   15.19  	edid_info = EDID_INFO;
   15.20  	saved_video_mode = SAVED_VIDEO_MODE;
   15.21  	bootloader_type = LOADER_TYPE;
    16.1 --- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Mon Feb 06 23:33:58 2006 +0100
    16.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Tue Feb 07 01:02:49 2006 +0100
    16.3 @@ -753,6 +753,7 @@ size_zones(unsigned long *z, unsigned lo
    16.4  void __init paging_init(void)
    16.5  {
    16.6  	unsigned long zones[MAX_NR_ZONES], holes[MAX_NR_ZONES];
    16.7 +	int i;
    16.8  
    16.9  	memory_present(0, 0, end_pfn);
   16.10  	sparse_init();
   16.11 @@ -766,20 +767,14 @@ void __init paging_init(void)
   16.12  	memset(empty_zero_page, 0, sizeof(empty_zero_page));
   16.13  	init_mm.context.pinned = 1;
   16.14  
   16.15 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
   16.16 -	{
   16.17 -		int i;
   16.18 -		/* Setup mapping of lower 1st MB */
   16.19 -		for (i = 0; i < NR_FIX_ISAMAPS; i++)
   16.20 -			if (xen_start_info->flags & SIF_PRIVILEGED)
   16.21 -				set_fixmap(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE);
   16.22 -			else
   16.23 -				__set_fixmap(FIX_ISAMAP_BEGIN - i,
   16.24 -					     virt_to_mfn(empty_zero_page) << PAGE_SHIFT,
   16.25 -					     PAGE_KERNEL_RO);
   16.26 -	}
   16.27 -#endif
   16.28 -
   16.29 +	/* Setup mapping of lower 1st MB */
   16.30 +	for (i = 0; i < NR_FIX_ISAMAPS; i++)
   16.31 +		if (xen_start_info->flags & SIF_PRIVILEGED)
   16.32 +			set_fixmap(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE);
   16.33 +		else
   16.34 +			__set_fixmap(FIX_ISAMAP_BEGIN - i,
   16.35 +				     virt_to_mfn(empty_zero_page) << PAGE_SHIFT,
   16.36 +				     PAGE_KERNEL_RO);
   16.37  }
   16.38  #endif
   16.39  
    17.1 --- a/linux-2.6-xen-sparse/drivers/Kconfig	Mon Feb 06 23:33:58 2006 +0100
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,98 +0,0 @@
    17.4 -# drivers/Kconfig
    17.5 -
    17.6 -menu "Device Drivers"
    17.7 -
    17.8 -source "drivers/base/Kconfig"
    17.9 -
   17.10 -if !XEN || XEN_PHYSDEV_ACCESS
   17.11 -
   17.12 -source "drivers/connector/Kconfig"
   17.13 -
   17.14 -source "drivers/mtd/Kconfig"
   17.15 -
   17.16 -source "drivers/parport/Kconfig"
   17.17 -
   17.18 -source "drivers/pnp/Kconfig"
   17.19 -endif
   17.20 -
   17.21 -source "drivers/block/Kconfig"
   17.22 -
   17.23 -if !XEN || XEN_PHYSDEV_ACCESS
   17.24 -source "drivers/ide/Kconfig"
   17.25 -endif
   17.26 -
   17.27 -source "drivers/scsi/Kconfig"
   17.28 -
   17.29 -if !XEN || XEN_PHYSDEV_ACCESS
   17.30 -source "drivers/cdrom/Kconfig"
   17.31 -endif
   17.32 -
   17.33 -source "drivers/md/Kconfig"
   17.34 -
   17.35 -if !XEN || XEN_PHYSDEV_ACCESS
   17.36 -source "drivers/message/fusion/Kconfig"
   17.37 -
   17.38 -source "drivers/ieee1394/Kconfig"
   17.39 -
   17.40 -source "drivers/message/i2o/Kconfig"
   17.41 -
   17.42 -source "drivers/macintosh/Kconfig"
   17.43 -endif
   17.44 -
   17.45 -source "drivers/net/Kconfig"
   17.46 -
   17.47 -if !XEN || XEN_PHYSDEV_ACCESS
   17.48 -source "drivers/isdn/Kconfig"
   17.49 -
   17.50 -source "drivers/telephony/Kconfig"
   17.51 -
   17.52 -# input before char - char/joystick depends on it. As does USB.
   17.53 -
   17.54 -source "drivers/input/Kconfig"
   17.55 -
   17.56 -source "drivers/char/Kconfig"
   17.57 -
   17.58 -source "drivers/i2c/Kconfig"
   17.59 -
   17.60 -source "drivers/spi/Kconfig"
   17.61 -
   17.62 -source "drivers/w1/Kconfig"
   17.63 -
   17.64 -source "drivers/hwmon/Kconfig"
   17.65 -
   17.66 -source "drivers/misc/Kconfig"
   17.67 -
   17.68 -source "drivers/mfd/Kconfig"
   17.69 -
   17.70 -source "drivers/media/Kconfig"
   17.71 -
   17.72 -source "drivers/video/Kconfig"
   17.73 -
   17.74 -source "sound/Kconfig"
   17.75 -
   17.76 -source "drivers/usb/Kconfig"
   17.77 -
   17.78 -source "drivers/mmc/Kconfig"
   17.79 -
   17.80 -source "drivers/infiniband/Kconfig"
   17.81 -endif
   17.82 -
   17.83 -if XEN && !XEN_PHYSDEV_ACCESS
   17.84 -# Gross hack. Fix later by allowing unprivileged guest to include
   17.85 -# char/Kconfig without breaking the build.
   17.86 -config UNIX98_PTYS
   17.87 -        bool
   17.88 -        default y
   17.89 -config LEGACY_PTYS
   17.90 -        bool
   17.91 -        default y
   17.92 -config LEGACY_PTY_COUNT
   17.93 -        int
   17.94 -        default "256"
   17.95 -endif
   17.96 -
   17.97 -source "drivers/sn/Kconfig"
   17.98 -
   17.99 -source "drivers/edac/Kconfig"
  17.100 -
  17.101 -endmenu
    18.1 --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig	Mon Feb 06 23:33:58 2006 +0100
    18.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig	Tue Feb 07 01:02:49 2006 +0100
    18.3 @@ -22,7 +22,6 @@ config XEN_PRIVILEGED_GUEST
    18.4  	bool "Privileged Guest (domain 0)"
    18.5  	depends XEN
    18.6  	default n
    18.7 -	select XEN_PHYSDEV_ACCESS
    18.8  	help
    18.9  	  Support for privileged operation (domain 0)
   18.10  
   18.11 @@ -30,19 +29,8 @@ config XEN_UNPRIVILEGED_GUEST
   18.12  	bool
   18.13  	default !XEN_PRIVILEGED_GUEST
   18.14  
   18.15 -config XEN_PHYSDEV_ACCESS
   18.16 -	bool "Physical device access"
   18.17 -	depends XEN_PRIVILEGED_GUEST
   18.18 -	default XEN_PRIVILEGED_GUEST
   18.19 -	help
   18.20 -	  Assume access is available to physical hardware devices
   18.21 -	  (e.g., hard drives, network cards). This allows you to configure
   18.22 -	  such devices and also includes some low-level support that is
   18.23 -	  otherwise not compiled into the kernel.
   18.24 -
   18.25  config XEN_BLKDEV_BACKEND
   18.26  	bool "Block-device backend driver"
   18.27 -	depends on XEN_PHYSDEV_ACCESS
   18.28  	default y
   18.29  	help
   18.30  	  The block-device backend driver allows the kernel to export its
   18.31 @@ -64,7 +52,6 @@ config XEN_BLKDEV_TAP_BE
   18.32  
   18.33  config XEN_NETDEV_BACKEND
   18.34  	bool "Network-device backend driver"
   18.35 -	depends on XEN_PHYSDEV_ACCESS
   18.36  	default y
   18.37  	help
   18.38  	  The network-device backend driver allows the kernel to export its
   18.39 @@ -86,7 +73,6 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
   18.40  
   18.41  config XEN_TPMDEV_BACKEND
   18.42  	bool "TPM-device backend driver"
   18.43 -	depends on XEN_PHYSDEV_ACCESS
   18.44  	default n
   18.45  	help
   18.46  	  The TPM-device backend driver
    19.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Mon Feb 06 23:33:58 2006 +0100
    19.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Tue Feb 07 01:02:49 2006 +0100
    19.3 @@ -562,7 +562,6 @@ static struct tty_operations xencons_ops
    19.4  	.wait_until_sent = xencons_wait_until_sent,
    19.5  };
    19.6  
    19.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    19.8  static const char *xennullcon_startup(void)
    19.9  {
   19.10  	return NULL;
   19.11 @@ -601,7 +600,6 @@ const struct consw xennull_con = {
   19.12  	.con_set_palette =	DUMMY,
   19.13  	.con_scrolldelta =	DUMMY,
   19.14  };
   19.15 -#endif
   19.16  
   19.17  static int __init xencons_init(void)
   19.18  {
    20.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h	Mon Feb 06 23:33:58 2006 +0100
    20.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h	Tue Feb 07 01:02:49 2006 +0100
    20.3 @@ -87,11 +87,9 @@ enum fixed_addresses {
    20.4  	FIX_SHARED_INFO,
    20.5  	FIX_GNTTAB_BEGIN,
    20.6  	FIX_GNTTAB_END = FIX_GNTTAB_BEGIN + NR_GRANT_FRAMES - 1,
    20.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    20.8  #define NR_FIX_ISAMAPS	256
    20.9  	FIX_ISAMAP_END,
   20.10  	FIX_ISAMAP_BEGIN = FIX_ISAMAP_END + NR_FIX_ISAMAPS - 1,
   20.11 -#endif
   20.12  	__end_of_permanent_fixed_addresses,
   20.13  	/* temporary boot-time mappings, used before ioremap() is functional */
   20.14  #define NR_FIX_BTMAPS	16
    21.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/io.h	Mon Feb 06 23:33:58 2006 +0100
    21.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/io.h	Tue Feb 07 01:02:49 2006 +0100
    21.3 @@ -153,11 +153,7 @@ extern void bt_iounmap(void *addr, unsig
    21.4   */
    21.5  #define isa_virt_to_bus(_x) isa_virt_to_bus_is_UNSUPPORTED->x
    21.6  #define isa_page_to_bus(_x) isa_page_to_bus_is_UNSUPPORTED->x
    21.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    21.8  #define isa_bus_to_virt(_x) (void *)(__fix_to_virt(FIX_ISAMAP_BEGIN) + (_x))
    21.9 -#else
   21.10 -#define isa_bus_to_virt(_x) isa_bus_to_virt_needs_PRIVILEGED_BUILD
   21.11 -#endif
   21.12  
   21.13  /*
   21.14   * However PCI ones are not necessarily 1:1 and therefore these interfaces
    22.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h	Mon Feb 06 23:33:58 2006 +0100
    22.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h	Tue Feb 07 01:02:49 2006 +0100
    22.3 @@ -54,11 +54,9 @@ enum fixed_addresses {
    22.4  	FIX_SHARED_INFO,
    22.5  	FIX_GNTTAB_BEGIN,
    22.6  	FIX_GNTTAB_END = FIX_GNTTAB_BEGIN + NR_GRANT_FRAMES - 1,
    22.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    22.8  #define NR_FIX_ISAMAPS	256
    22.9  	FIX_ISAMAP_END,
   22.10  	FIX_ISAMAP_BEGIN = FIX_ISAMAP_END + NR_FIX_ISAMAPS - 1,
   22.11 -#endif
   22.12  	__end_of_fixed_addresses
   22.13  };
   22.14  
    23.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/io.h	Mon Feb 06 23:33:58 2006 +0100
    23.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/io.h	Tue Feb 07 01:02:49 2006 +0100
    23.3 @@ -169,11 +169,8 @@ extern void iounmap(volatile void __iome
    23.4  
    23.5  #define isa_virt_to_bus(_x) isa_virt_to_bus_is_UNSUPPORTED->x
    23.6  #define isa_page_to_bus(_x) isa_page_to_bus_is_UNSUPPORTED->x
    23.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
    23.8  #define isa_bus_to_virt(_x) (void *)(__fix_to_virt(FIX_ISAMAP_BEGIN) + (_x))
    23.9 -#else
   23.10 -#define isa_bus_to_virt(_x) isa_bus_to_virt_needs_PRIVILEGED_BUILD
   23.11 -#endif
   23.12 +
   23.13  /*
   23.14   * However PCI ones are not necessarily 1:1 and therefore these interfaces
   23.15   * are forbidden in portable PCI drivers.