# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 55268b90a51993d86d116d7bd03d23ae8fe63f17
# Parent 707cb68a391f26f41e0f272b35c3374bc495a6ff
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@xxxxxxxxxxxxx>
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xen0_ia64
--- a/buildconfigs/linux-defconfig_xen0_ia64 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xen0_ia64 Tue Feb 7 00:02:49 2006
@@ -94,7 +94,6 @@
CONFIG_XEN=y
CONFIG_ARCH_XEN=y
CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_VT=y
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xen0_x86_32
--- a/buildconfigs/linux-defconfig_xen0_x86_32 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xen0_x86_32 Tue Feb 7 00:02:49 2006
@@ -1308,7 +1308,6 @@
#
CONFIG_XEN_PRIVILEGED_GUEST=y
# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
-CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_BACKEND=y
# CONFIG_XEN_BLKDEV_TAP_BE is not set
CONFIG_XEN_NETDEV_BACKEND=y
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xen0_x86_64
--- a/buildconfigs/linux-defconfig_xen0_x86_64 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xen0_x86_64 Tue Feb 7 00:02:49 2006
@@ -1233,7 +1233,6 @@
#
CONFIG_XEN_PRIVILEGED_GUEST=y
# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
-CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_BACKEND=y
# CONFIG_XEN_BLKDEV_TAP_BE is not set
CONFIG_XEN_NETDEV_BACKEND=y
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xenU_ia64
--- a/buildconfigs/linux-defconfig_xenU_ia64 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xenU_ia64 Tue Feb 7 00:02:49 2006
@@ -93,7 +93,6 @@
CONFIG_XEN=y
CONFIG_ARCH_XEN=y
CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_BLKDEV_FRONTEND=y
# CONFIG_XEN_VT is not set
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xenU_x86_32
--- a/buildconfigs/linux-defconfig_xenU_x86_32 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xenU_x86_32 Tue Feb 7 00:02:49 2006
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc2-xenU
-# Mon Feb 6 13:25:40 2006
+# Mon Feb 6 23:16:07 2006
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
@@ -149,7 +149,7 @@
# CONFIG_I8K is not set
# CONFIG_X86_REBOOTFIXUPS is not set
CONFIG_X86_CPUID=y
-# CONFIG_SWIOTLB is not set
+CONFIG_SWIOTLB=y
#
# Firmware Drivers
@@ -184,6 +184,21 @@
CONFIG_HOTPLUG_CPU=y
#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+# CONFIG_PCI is not set
+# CONFIG_SCx200 is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+
+#
# Executable file formats
#
CONFIG_BINFMT_ELF=y
@@ -278,6 +293,25 @@
# CONFIG_DEBUG_DRIVER is not set
#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
# Block devices
#
# CONFIG_BLK_DEV_FD is not set
@@ -293,6 +327,11 @@
# CONFIG_ATA_OVER_ETH is not set
#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
# SCSI device support
#
# CONFIG_RAID_ATTRS is not set
@@ -335,6 +374,19 @@
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
#
# Network device support
@@ -381,9 +433,187 @@
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+
+#
+# Non-8250 serial port support
+#
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_MWAVE is not set
+# CONFIG_CS5535_GPIO is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+# CONFIG_VIDEO_SELECT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
#
# SN Devices
@@ -627,6 +857,9 @@
#
# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_XEN_UNPRIVILEGED_GUEST=y
+# CONFIG_XEN_BLKDEV_BACKEND is not set
+# CONFIG_XEN_NETDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
# CONFIG_XEN_BLKDEV_TAP is not set
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xenU_x86_64
--- a/buildconfigs/linux-defconfig_xenU_x86_64 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xenU_x86_64 Tue Feb 7 00:02:49 2006
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc2-xenU
-# Fri Feb 3 16:30:13 2006
+# Mon Feb 6 23:49:06 2006
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -128,6 +128,7 @@
CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_NR_CPUS=8
# CONFIG_HOTPLUG_CPU is not set
+CONFIG_SWIOTLB=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
CONFIG_SECCOMP=y
@@ -478,6 +479,25 @@
# CONFIG_DEBUG_DRIVER is not set
#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
# Block devices
#
CONFIG_BLK_DEV_FD=m
@@ -491,6 +511,11 @@
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
#
# SCSI device support
@@ -553,6 +578,19 @@
# CONFIG_DM_MULTIPATH is not set
#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
# Network device support
#
CONFIG_NETDEVICES=y
@@ -600,9 +638,6 @@
# Wan interfaces
#
# CONFIG_WAN is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
#
# ATM drivers
@@ -626,7 +661,187 @@
# CONFIG_NETPOLL_RX is not set
CONFIG_NETPOLL_TRAP=y
CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_INPUT=m
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+
+#
+# Non-8250 serial port support
+#
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+# CONFIG_VIDEO_SELECT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
#
# SN Devices
@@ -920,6 +1135,9 @@
#
# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_XEN_UNPRIVILEGED_GUEST=y
+# CONFIG_XEN_BLKDEV_BACKEND is not set
+# CONFIG_XEN_NETDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
# CONFIG_XEN_BLKDEV_TAP is not set
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xen_x86_32
--- a/buildconfigs/linux-defconfig_xen_x86_32 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xen_x86_32 Tue Feb 7 00:02:49 2006
@@ -2990,7 +2990,6 @@
#
CONFIG_XEN_PRIVILEGED_GUEST=y
# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
-CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_BACKEND=y
# CONFIG_XEN_BLKDEV_TAP_BE is not set
CONFIG_XEN_NETDEV_BACKEND=y
diff -r 707cb68a391f -r 55268b90a519 buildconfigs/linux-defconfig_xen_x86_64
--- a/buildconfigs/linux-defconfig_xen_x86_64 Mon Feb 6 22:33:58 2006
+++ b/buildconfigs/linux-defconfig_xen_x86_64 Tue Feb 7 00:02:49 2006
@@ -2665,7 +2665,6 @@
#
CONFIG_XEN_PRIVILEGED_GUEST=y
# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
-CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_BACKEND=y
# CONFIG_XEN_BLKDEV_TAP_BE is not set
CONFIG_XEN_NETDEV_BACKEND=y
diff -r 707cb68a391f -r 55268b90a519 linux-2.6-xen-sparse/arch/i386/Kconfig
--- a/linux-2.6-xen-sparse/arch/i386/Kconfig Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/i386/Kconfig Tue Feb 7 00:02:49 2006
@@ -62,7 +62,7 @@
bool "Xen-compatible"
select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST
- select SWIOTLB if XEN_PHYSDEV_ACCESS
+ select SWIOTLB
help
Choose this option is you plan to run this kernel on top of Xen
Hypervisor.
@@ -951,7 +951,6 @@
endmenu
menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
- depends on !XEN_UNPRIVILEGED_GUEST
config PCI
bool "PCI support" if !X86_VISWS
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Tue Feb 7 00:02:49 2006
@@ -1678,7 +1678,6 @@
}
bootloader_type = LOADER_TYPE;
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
if (xen_start_info->flags & SIF_INITDOMAIN) {
/* This is drawn from a dump from vgacon:startup in
* standard Linux. */
@@ -1690,9 +1689,6 @@
screen_info.orig_video_points = 16;
} else
screen_info.orig_video_isVGA = 0;
-#else
- screen_info.orig_video_isVGA = 0;
-#endif
#ifdef CONFIG_BLK_DEV_RAM
rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
@@ -1869,7 +1865,6 @@
#endif
#endif
} else {
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
extern const struct consw xennull_con;
extern int console_use_vt;
#if defined(CONFIG_VGA_CONSOLE)
@@ -1878,7 +1873,6 @@
#endif
conswitchp = &xennull_con;
console_use_vt = 0;
-#endif
}
}
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/arch/i386/mm/init-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c Tue Feb 7 00:02:49 2006
@@ -531,9 +531,7 @@
*/
void __init paging_init(void)
{
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
int i;
-#endif
#ifdef CONFIG_X86_PAE
set_nx();
@@ -562,7 +560,6 @@
HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
memset(empty_zero_page, 0, sizeof(empty_zero_page));
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
/* Setup mapping of lower 1st MB */
for (i = 0; i < NR_FIX_ISAMAPS; i++)
if (xen_start_info->flags & SIF_PRIVILEGED)
@@ -571,7 +568,6 @@
__set_fixmap(FIX_ISAMAP_BEGIN - i,
virt_to_machine(empty_zero_page),
PAGE_KERNEL_RO);
-#endif
}
/*
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c Tue Feb 7 00:02:49 2006
@@ -172,8 +172,6 @@
EXPORT_SYMBOL(touch_pte_range);
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
-
/*
* Does @address reside within a non-highmem page that is local to this virtual
* machine (i.e., not an I/O page, nor a memory page belonging to another VM).
@@ -450,38 +448,6 @@
#endif /* __i386__ */
-#else /* CONFIG_XEN_PHYSDEV_ACCESS */
-
-void __iomem * __ioremap(unsigned long phys_addr, unsigned long size,
- unsigned long flags)
-{
- return NULL;
-}
-
-void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size)
-{
- return NULL;
-}
-
-void iounmap(volatile void __iomem *addr)
-{
-}
-
-#ifdef __i386__
-
-void __init *bt_ioremap(unsigned long phys_addr, unsigned long size)
-{
- return NULL;
-}
-
-void __init bt_iounmap(void *addr, unsigned long size)
-{
-}
-
-#endif /* __i386__ */
-
-#endif /* CONFIG_XEN_PHYSDEV_ACCESS */
-
/*
* Local variables:
* c-file-style: "linux"
diff -r 707cb68a391f -r 55268b90a519 linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig Tue Feb 7 00:02:49 2006
@@ -68,11 +68,6 @@
default n
help
Used in drivers/xen/privcmd.c. Should go away?
-
-config XEN_PHYSDEV_ACCESS
- depends on XEN
- bool
- default y
config XEN_BLKDEV_GRANT
depends on XEN
diff -r 707cb68a391f -r 55268b90a519 linux-2.6-xen-sparse/arch/x86_64/Kconfig
--- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig Tue Feb 7 00:02:49 2006
@@ -121,7 +121,7 @@
config X86_64_XEN
bool "Enable Xen compatible kernel"
- select SWIOTLB if XEN_PHYSDEV_ACCESS
+ select SWIOTLB
help
This option will compile a kernel compatible with Xen hypervisor
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Mon Feb 6
22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Tue Feb 7
00:02:49 2006
@@ -630,7 +630,6 @@
ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
drive_info = DRIVE_INFO;
kernel_end = 0; /* dummy */
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
screen_info = SCREEN_INFO;
if (xen_start_info->flags & SIF_INITDOMAIN) {
@@ -644,9 +643,7 @@
screen_info.orig_video_points = 16;
} else
screen_info.orig_video_isVGA = 0;
-#else
- screen_info.orig_video_isVGA = 0;
-#endif
+
edid_info = EDID_INFO;
saved_video_mode = SAVED_VIDEO_MODE;
bootloader_type = LOADER_TYPE;
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c Tue Feb 7 00:02:49 2006
@@ -753,6 +753,7 @@
void __init paging_init(void)
{
unsigned long zones[MAX_NR_ZONES], holes[MAX_NR_ZONES];
+ int i;
memory_present(0, 0, end_pfn);
sparse_init();
@@ -766,20 +767,14 @@
memset(empty_zero_page, 0, sizeof(empty_zero_page));
init_mm.context.pinned = 1;
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
- {
- int i;
- /* Setup mapping of lower 1st MB */
- for (i = 0; i < NR_FIX_ISAMAPS; i++)
- if (xen_start_info->flags & SIF_PRIVILEGED)
- set_fixmap(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE);
- else
- __set_fixmap(FIX_ISAMAP_BEGIN - i,
- virt_to_mfn(empty_zero_page) <<
PAGE_SHIFT,
- PAGE_KERNEL_RO);
- }
-#endif
-
+ /* Setup mapping of lower 1st MB */
+ for (i = 0; i < NR_FIX_ISAMAPS; i++)
+ if (xen_start_info->flags & SIF_PRIVILEGED)
+ set_fixmap(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE);
+ else
+ __set_fixmap(FIX_ISAMAP_BEGIN - i,
+ virt_to_mfn(empty_zero_page) << PAGE_SHIFT,
+ PAGE_KERNEL_RO);
}
#endif
diff -r 707cb68a391f -r 55268b90a519 linux-2.6-xen-sparse/drivers/xen/Kconfig
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig Mon Feb 6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig Tue Feb 7 00:02:49 2006
@@ -22,7 +22,6 @@
bool "Privileged Guest (domain 0)"
depends XEN
default n
- select XEN_PHYSDEV_ACCESS
help
Support for privileged operation (domain 0)
@@ -30,19 +29,8 @@
bool
default !XEN_PRIVILEGED_GUEST
-config XEN_PHYSDEV_ACCESS
- bool "Physical device access"
- depends XEN_PRIVILEGED_GUEST
- default XEN_PRIVILEGED_GUEST
- help
- Assume access is available to physical hardware devices
- (e.g., hard drives, network cards). This allows you to configure
- such devices and also includes some low-level support that is
- otherwise not compiled into the kernel.
-
config XEN_BLKDEV_BACKEND
bool "Block-device backend driver"
- depends on XEN_PHYSDEV_ACCESS
default y
help
The block-device backend driver allows the kernel to export its
@@ -64,7 +52,6 @@
config XEN_NETDEV_BACKEND
bool "Network-device backend driver"
- depends on XEN_PHYSDEV_ACCESS
default y
help
The network-device backend driver allows the kernel to export its
@@ -86,7 +73,6 @@
config XEN_TPMDEV_BACKEND
bool "TPM-device backend driver"
- depends on XEN_PHYSDEV_ACCESS
default n
help
The TPM-device backend driver
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/drivers/xen/console/console.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c Mon Feb 6
22:33:58 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c Tue Feb 7
00:02:49 2006
@@ -562,7 +562,6 @@
.wait_until_sent = xencons_wait_until_sent,
};
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
static const char *xennullcon_startup(void)
{
return NULL;
@@ -601,7 +600,6 @@
.con_set_palette = DUMMY,
.con_scrolldelta = DUMMY,
};
-#endif
static int __init xencons_init(void)
{
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Mon Feb
6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Tue Feb
7 00:02:49 2006
@@ -87,11 +87,9 @@
FIX_SHARED_INFO,
FIX_GNTTAB_BEGIN,
FIX_GNTTAB_END = FIX_GNTTAB_BEGIN + NR_GRANT_FRAMES - 1,
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
#define NR_FIX_ISAMAPS 256
FIX_ISAMAP_END,
FIX_ISAMAP_BEGIN = FIX_ISAMAP_END + NR_FIX_ISAMAPS - 1,
-#endif
__end_of_permanent_fixed_addresses,
/* temporary boot-time mappings, used before ioremap() is functional */
#define NR_FIX_BTMAPS 16
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/io.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/io.h Mon Feb 6
22:33:58 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/io.h Tue Feb 7
00:02:49 2006
@@ -153,11 +153,7 @@
*/
#define isa_virt_to_bus(_x) isa_virt_to_bus_is_UNSUPPORTED->x
#define isa_page_to_bus(_x) isa_page_to_bus_is_UNSUPPORTED->x
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
#define isa_bus_to_virt(_x) (void *)(__fix_to_virt(FIX_ISAMAP_BEGIN) + (_x))
-#else
-#define isa_bus_to_virt(_x) isa_bus_to_virt_needs_PRIVILEGED_BUILD
-#endif
/*
* However PCI ones are not necessarily 1:1 and therefore these interfaces
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h Mon Feb
6 22:33:58 2006
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h Tue Feb
7 00:02:49 2006
@@ -54,11 +54,9 @@
FIX_SHARED_INFO,
FIX_GNTTAB_BEGIN,
FIX_GNTTAB_END = FIX_GNTTAB_BEGIN + NR_GRANT_FRAMES - 1,
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
#define NR_FIX_ISAMAPS 256
FIX_ISAMAP_END,
FIX_ISAMAP_BEGIN = FIX_ISAMAP_END + NR_FIX_ISAMAPS - 1,
-#endif
__end_of_fixed_addresses
};
diff -r 707cb68a391f -r 55268b90a519
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/io.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/io.h Mon Feb 6
22:33:58 2006
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/io.h Tue Feb 7
00:02:49 2006
@@ -169,11 +169,8 @@
#define isa_virt_to_bus(_x) isa_virt_to_bus_is_UNSUPPORTED->x
#define isa_page_to_bus(_x) isa_page_to_bus_is_UNSUPPORTED->x
-#ifdef CONFIG_XEN_PHYSDEV_ACCESS
#define isa_bus_to_virt(_x) (void *)(__fix_to_virt(FIX_ISAMAP_BEGIN) + (_x))
-#else
-#define isa_bus_to_virt(_x) isa_bus_to_virt_needs_PRIVILEGED_BUILD
-#endif
+
/*
* However PCI ones are not necessarily 1:1 and therefore these interfaces
* are forbidden in portable PCI drivers.
diff -r 707cb68a391f -r 55268b90a519 linux-2.6-xen-sparse/drivers/Kconfig
--- a/linux-2.6-xen-sparse/drivers/Kconfig Mon Feb 6 22:33:58 2006
+++ /dev/null Tue Feb 7 00:02:49 2006
@@ -1,98 +0,0 @@
-# drivers/Kconfig
-
-menu "Device Drivers"
-
-source "drivers/base/Kconfig"
-
-if !XEN || XEN_PHYSDEV_ACCESS
-
-source "drivers/connector/Kconfig"
-
-source "drivers/mtd/Kconfig"
-
-source "drivers/parport/Kconfig"
-
-source "drivers/pnp/Kconfig"
-endif
-
-source "drivers/block/Kconfig"
-
-if !XEN || XEN_PHYSDEV_ACCESS
-source "drivers/ide/Kconfig"
-endif
-
-source "drivers/scsi/Kconfig"
-
-if !XEN || XEN_PHYSDEV_ACCESS
-source "drivers/cdrom/Kconfig"
-endif
-
-source "drivers/md/Kconfig"
-
-if !XEN || XEN_PHYSDEV_ACCESS
-source "drivers/message/fusion/Kconfig"
-
-source "drivers/ieee1394/Kconfig"
-
-source "drivers/message/i2o/Kconfig"
-
-source "drivers/macintosh/Kconfig"
-endif
-
-source "drivers/net/Kconfig"
-
-if !XEN || XEN_PHYSDEV_ACCESS
-source "drivers/isdn/Kconfig"
-
-source "drivers/telephony/Kconfig"
-
-# input before char - char/joystick depends on it. As does USB.
-
-source "drivers/input/Kconfig"
-
-source "drivers/char/Kconfig"
-
-source "drivers/i2c/Kconfig"
-
-source "drivers/spi/Kconfig"
-
-source "drivers/w1/Kconfig"
-
-source "drivers/hwmon/Kconfig"
-
-source "drivers/misc/Kconfig"
-
-source "drivers/mfd/Kconfig"
-
-source "drivers/media/Kconfig"
-
-source "drivers/video/Kconfig"
-
-source "sound/Kconfig"
-
-source "drivers/usb/Kconfig"
-
-source "drivers/mmc/Kconfig"
-
-source "drivers/infiniband/Kconfig"
-endif
-
-if XEN && !XEN_PHYSDEV_ACCESS
-# Gross hack. Fix later by allowing unprivileged guest to include
-# char/Kconfig without breaking the build.
-config UNIX98_PTYS
- bool
- default y
-config LEGACY_PTYS
- bool
- default y
-config LEGACY_PTY_COUNT
- int
- default "256"
-endif
-
-source "drivers/sn/Kconfig"
-
-source "drivers/edac/Kconfig"
-
-endmenu
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home