LU-690 test: wait_osc_import_state() fixes

[fs/lustre-release.git] / lustre / kernel_patches / kernel_configs / kernel-2.6.9-2.6-rhel4-x86_64.config

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
index 48fcb26..b11435f 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.9-prep.qp2.2.5.11.3qsnet
-# Mon Mar 12 20:21:30 2007
+# Linux kernel version: 2.6.9-prep.qp3.5.34.4qsnet
+# Thu Jun 11 17:35:02 2009
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -13,6 +13,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_HPET_TIMER=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
+CONFIG_TICK_DIVIDER=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 
@@ -21,6 +22,7 @@ CONFIG_GENERIC_IOMAP=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
 
 #
 # General setup
@@ -31,6 +33,7 @@ CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASK_IO_ACCOUNTING is not set
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
@@ -63,7 +66,6 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
 CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
 
 #
 # Processor type and features
@@ -72,6 +74,7 @@ CONFIG_STOP_MACHINE=y
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y
 # CONFIG_MEM_MIRROR is not set
+# CONFIG_X86_64_XEN is not set
 CONFIG_X86_L1_CACHE_BYTES=128
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_TSC=y
@@ -79,27 +82,19 @@ CONFIG_X86_GOOD_APIC=y
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
-CONFIG_X86_HT=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_LOCAL_APIC_INFO_MOD=m
 CONFIG_MTRR=y
-CONFIG_SMP=y
+# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_K8_NUMA=y
-CONFIG_DISCONTIGMEM=y
-CONFIG_NUMA=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_NR_CPUS=8
 CONFIG_GART_IOMMU=y
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_AMD=y
 CONFIG_IOPROC=y
 CONFIG_PTRACK=y
-# CONFIG_X86_64_XEN is not set
- 
+
 #
 # Power management options
 #
@@ -121,7 +116,6 @@ CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=2001
@@ -162,7 +156,6 @@ CONFIG_PCI=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_UNORDERED_IO is not set
-# CONFIG_HOTPLUG_CPU is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 # CONFIG_PCI_NAMES is not set
@@ -445,7 +438,7 @@ CONFIG_SCSI_LOGGING=y
 #
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set
 
 #
 # SCSI low-level drivers
@@ -469,6 +462,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -483,7 +477,7 @@ CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 # CONFIG_SCSI_INIA100 is not set
-CONFIG_SCSI_ISCSI_SFNET=m
+# CONFIG_SCSI_ISCSI_SFNET is not set
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
@@ -506,9 +500,8 @@ CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
 CONFIG_SCSI_QLA6312=m
 CONFIG_SCSI_QLA24XX=m
-CONFIG_QLA3XXX=m
+CONFIG_SCSI_QLA25XX=m
 CONFIG_SCSI_QLA4XXX=m
-
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -523,7 +516,7 @@ CONFIG_SCSI_QLA4XXX=m
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-CONFIG_ATA=y
+CONFIG_ATA=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
@@ -540,6 +533,8 @@ CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
 CONFIG_SATA_INTEL_COMBINED=y
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_JMICRON=m
 
 #
 # Multi-device support (RAID and LVM)
@@ -560,6 +555,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_HP=m
 
 #
 # Fusion MPT device support
@@ -646,6 +642,7 @@ CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_TUNNEL=m
+CONFIG_INET_LRO=m
 
 #
 # IP: Virtual Server Configuration
@@ -952,6 +949,7 @@ CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
+# CONFIG_PCMCIA_XIRTULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
@@ -989,6 +987,8 @@ CONFIG_ACENIC=m
 CONFIG_DL2K=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
+CONFIG_E1000E=m
+CONFIG_IGB=m
 CONFIG_NS83820=m
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -1000,14 +1000,20 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
 #
+CONFIG_IXGBE=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
+# CONFIG_CHELSIO_T3 is not set
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_NETXEN_NIC=m
+CONFIG_BNX2X=m
+# CONFIG_MLX4_CORE is not set
 
 #
 # Token Ring devices
@@ -1020,17 +1026,6 @@ CONFIG_TMSPCI=m
 CONFIG_ABYSS=m
 
 #
-# Quadrics QsNet
-#
-CONFIG_QSNET=m
-CONFIG_ELAN3=m
-CONFIG_ELAN4=m
-CONFIG_EP=m
-CONFIG_EIP=m
-CONFIG_RMS=m
-CONFIG_JTAG=m
-
-#
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
@@ -1163,6 +1158,7 @@ CONFIG_ISDN_TTY_FAX=y
 #
 # ISDN feature submodules
 #
+# CONFIG_ISDN_DRV_LOOP is not set
 
 #
 # ISDN4Linux hardware drivers
@@ -1228,6 +1224,7 @@ CONFIG_HISAX_HDLC=y
 # Active cards
 #
 CONFIG_ISDN_DRV_TPAM=m
+# CONFIG_HYSDN is not set
 
 #
 # CAPI subsystem
@@ -1332,12 +1329,24 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_COMPUTONE is not set
 # CONFIG_ROCKETPORT is not set
 # CONFIG_CYCLADES is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_DIGI is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_ISI is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
 CONFIG_N_HDLC=m
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
 CONFIG_STALDRV=y
+# CONFIG_STALLION is not set
+# CONFIG_ISTALLION is not set
 
 #
 # Serial drivers
@@ -1426,6 +1435,7 @@ CONFIG_DTLK=m
 #
 # Ftape, the floppy tape device driver
 #
+# CONFIG_FTAPE is not set
 CONFIG_AGP=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_INTEL=y
@@ -1477,6 +1487,7 @@ CONFIG_I2C_ISA=m
 CONFIG_I2C_NFORCE2=m
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
+CONFIG_I2C_PIIX4=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 # CONFIG_SCx200_ACB is not set
@@ -1558,7 +1569,7 @@ CONFIG_VIDEO_DEV=m
 #
 # Video Adapters
 #
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_BWQCAM is not set
 # CONFIG_VIDEO_CQCAM is not set
 # CONFIG_VIDEO_W9966 is not set
@@ -1587,6 +1598,10 @@ CONFIG_VIDEO_OVCAMCHIP=m
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_BUF=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
 
 #
 # Graphics support
@@ -1683,7 +1698,6 @@ CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
 CONFIG_SND_AZT3328=m
-CONFIG_SND_AZX=m
 CONFIG_SND_BT87X=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
@@ -1695,6 +1709,7 @@ CONFIG_SND_NM256=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
+CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_YMFPCI=m
@@ -1861,6 +1876,7 @@ CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -1923,23 +1939,7 @@ CONFIG_USB_SPEEDTOUCH=m
 #
 # InfiniBand support
 #
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_IPATH_CORE=m
-CONFIG_INFINIBAND_IPATH=m
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
-# CONFIG_INFINIBAND_ISER is not set
-# CONFIG_INFINIBAND_RDS_DEBUG is not set
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set
 
 #
 # EDAC - error detection and reporting (RAS)
@@ -1955,10 +1955,12 @@ CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I82860=m
+CONFIG_EDAC_K8=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_POLL=y
-CONFIG_EDAC_K8=m
 
 #
 # Firmware Drivers
@@ -2083,8 +2085,11 @@ CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -2167,7 +2172,8 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_CHECKING is not set
 CONFIG_INIT_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_IOMMU_DEBUG is not set
@@ -2219,6 +2225,13 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_SIGNATURE=y
 CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_MPILIB=y
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
+
+#
+# Xen PV-ON-HVM Configuration
+#
+CONFIG_XEN_PV_ON_HVM=y
 
 #
 # Library routines
@@ -2228,3 +2241,4 @@ CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_HAS_IOMEM=y