aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@firebug.cl.cam.ac.uk <iap10@firebug.cl.cam.ac.uk>2005-08-15 10:55:11 +0000
committeriap10@firebug.cl.cam.ac.uk <iap10@firebug.cl.cam.ac.uk>2005-08-15 10:55:11 +0000
commit6db7983320240d04201ba538817673746cc0202a (patch)
tree475f1fc8439a49973f120972bf19c8e29c5d8209
parent8f3a7366b2a696a1f5bca153ce2e7353eec1768c (diff)
downloadxen-6db7983320240d04201ba538817673746cc0202a.tar.gz
xen-6db7983320240d04201ba538817673746cc0202a.tar.bz2
xen-6db7983320240d04201ba538817673746cc0202a.zip
Add a few options to the Linux x86_64 domU config.
Signed-off-by: ian@xensource.com
-rw-r--r--linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_6430
1 files changed, 26 insertions, 4 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
index 84bc803069..507ff8c2a7 100644
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-xen0
-# Tue Aug 2 23:55:35 2005
+# Linux kernel version: 2.6.12.3-xen0
+# Mon Aug 15 11:36:25 2005
#
CONFIG_XEN=y
CONFIG_ARCH_XEN=y
@@ -118,6 +118,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_GENERIC_CPU=y
CONFIG_X86_L1_CACHE_BYTES=128
# CONFIG_X86_TSC is not set
+CONFIG_X86_XEN_GENAPIC=y
# CONFIG_X86_MSR is not set
# CONFIG_GART_IOMMU is not set
CONFIG_DUMMY_IOMMU=y
@@ -371,7 +372,23 @@ CONFIG_SCSI_QLA2XXX=y
#
# Multi-device support (RAID and LVM)
#
-# CONFIG_MD is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+# CONFIG_MD_RAID10 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+# CONFIG_MD_FAULTY is not set
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_MIRROR=y
+# CONFIG_DM_ZERO is not set
+CONFIG_DM_MULTIPATH=y
+CONFIG_DM_MULTIPATH_EMC=y
#
# Fusion MPT device support
@@ -803,7 +820,12 @@ CONFIG_USB_ARCH_HAS_OHCI=y
#
# InfiniBand support
#
-# CONFIG_INFINIBAND is not set
+CONFIG_INFINIBAND=y
+CONFIG_INFINIBAND_MTHCA=y
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_IPOIB=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
#
# Power management options