ChangeSet 1.1236.60.1, 2005/04/06 09:37:09+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
X86_64 fixes.
From: "Nakajima, Jun" <jun.nakajima@xxxxxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
b/linux-2.6.11-xen-sparse/arch/xen/Kconfig | 12
b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 | 8
b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 | 71
b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 | 8
b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig | 4
b/linux-2.6.11-xen-sparse/arch/xen/kernel/evtchn.c | 9
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig | 12
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S | 2
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ioport.c | 24
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c | 5
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c | 7
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c | 98
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c | 22
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup64.c | 4
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/hypervisor.c | 591 ----
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c | 4
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/ioremap.c | 22
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/pageattr.c | 1
b/linux-2.6.11-xen-sparse/drivers/xen/privcmd/privcmd.c | 14
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/hypercall.h | 536 ++++
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/desc.h | 16
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h | 4
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h | 30
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mmu_context.h | 1
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/pgalloc.h | 14
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h | 6
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/system.h | 12
b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h | 512 ----
linux-2.6.11-xen-sparse/arch/xen/x86_64/defconfig | 1249
----------
29 files changed, 864 insertions(+), 2434 deletions(-)
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/Kconfig
b/linux-2.6.11-xen-sparse/arch/xen/Kconfig
--- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig 2005-04-10 23:03:25 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig 2005-04-10 23:03:25 -04:00
@@ -136,17 +136,17 @@
choice
prompt "Processor Type"
- default X86
+ default XEN_X86
-config X86
+config XEN_X86
bool "X86"
help
Choose this option if your computer is a X86 architecture.
-config X86_64
+config XEN_X86_64
bool "X86_64"
help
- Choose this option if your computer is a X86 architecture.
+ Choose this option if your computer is a X86_64 architecture.
endchoice
@@ -158,11 +158,11 @@
source "init/Kconfig"
-if X86
+if XEN_X86
source "arch/xen/i386/Kconfig"
endif
-if X86_64
+if XEN_X86_64
source "arch/xen/x86_64/Kconfig"
endif
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
2005-04-10 23:03:25 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
2005-04-10 23:03:25 -04:00
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11-xen0
-# Sat Mar 19 19:42:39 2005
+# Wed Apr 6 09:19:05 2005
#
CONFIG_XEN=y
CONFIG_ARCH_XEN=y
@@ -14,14 +14,15 @@
CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_BACKEND=y
# CONFIG_XEN_BLKDEV_TAP_BE is not set
+CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_BLKDEV_TAP is not set
CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_X86=y
-# CONFIG_X86_64 is not set
+CONFIG_XEN_X86=y
+# CONFIG_XEN_X86_64 is not set
CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
#
@@ -75,6 +76,7 @@
# X86 Processor Configuration
#
CONFIG_XENARCH="i386"
+CONFIG_X86=y
CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_GENERIC_ISA_DMA=y
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
2005-04-10 23:03:25 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
2005-04-10 23:03:25 -04:00
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-xen0
-# Tue Mar 15 10:39:50 2005
+# Linux kernel version: 2.6.11-xen0
+# Wed Apr 6 09:21:54 2005
#
CONFIG_XEN=y
CONFIG_ARCH_XEN=y
@@ -14,12 +14,12 @@
CONFIG_XEN_PHYSDEV_ACCESS=y
CONFIG_XEN_BLKDEV_BACKEND=y
# CONFIG_XEN_BLKDEV_TAP_BE is not set
+CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_BLKDEV_TAP is not set
-# CONFIG_XEN_WRITABLE_PAGETABLES=y
CONFIG_XEN_SCRUB_PAGES=y
# CONFIG_XEN_X86 is not set
CONFIG_XEN_X86_64=y
@@ -67,13 +67,14 @@
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_XENARCH="x86_64"
+CONFIG_X86=y
CONFIG_MMU=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
-# CONFIG_MK8 is not set
CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_X86_GOOD_APIC=y
# CONFIG_HPET_TIMER is not set
# CONFIG_SMP is not set
@@ -92,7 +93,6 @@
# X86_64 processor configuration
#
CONFIG_X86_64=y
-CONFIG_X86=y
CONFIG_64BIT=y
#
@@ -116,7 +116,6 @@
# ACPI (Advanced Configuration and Power Interface) Support
#
# CONFIG_ACPI is not set
-# CONFIG_ACPI_BLACKLIST_YEAR=0
#
# CPU Frequency scaling
@@ -124,20 +123,11 @@
# CONFIG_CPU_FREQ is not set
#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+# Bus options (PCI etc.)
#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_LEGACY_PROC=y
-# CONFIG_PCI_NAMES is not set
# CONFIG_PCI_MMCONFIG is not set
#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
# Executable file formats / Emulations
#
# CONFIG_IA32_EMULATION is not set
@@ -180,6 +170,7 @@
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
@@ -252,37 +243,22 @@
# CONFIG_SCSI_SATA_AHCI is not set
# CONFIG_SCSI_SATA_SVW is not set
CONFIG_SCSI_ATA_PIIX=y
-# CONFIG_SCSI_SATA_NV is not set
CONFIG_SCSI_SATA_PROMISE=y
# CONFIG_SCSI_SATA_QSTOR is not set
-CONFIG_SCSI_SATA_SX4=y
-CONFIG_SCSI_SATA_SIL=y
-# CONFIG_SCSI_SATA_SIS is not set
-# CONFIG_SCSI_SATA_ULI is not set
# CONFIG_SCSI_SATA_VIA is not set
# CONFIG_SCSI_SATA_VITESSE is not set
CONFIG_SCSI_BUSLOGIC=y
# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-# CONFIG_SCSI_CPQFCTS is not set
# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_EATA_PIO is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
# CONFIG_SCSI_QLOGIC_ISP is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -292,14 +268,7 @@
# CONFIG_SCSI_QLA2300 is not set
# CONFIG_SCSI_QLA2322 is not set
# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
#
@@ -409,6 +378,7 @@
CONFIG_SERIO_SERPORT=y
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
#
@@ -533,6 +503,16 @@
# CONFIG_USB_GADGET is not set
#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
# File systems
#
CONFIG_EXT2_FS=y
@@ -548,6 +528,10 @@
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
+
+#
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home