Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
kernel_patches
/
kernel_configs
/
kernel-2.6.9-2.6-rhel4-x86_64-smp.config
diff --git
a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
index
bfb5994
..
028c475
100644
(file)
--- a/
lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
+++ b/
lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
@@
-1,7
+1,7
@@
#
# Automatically generated make config: don't edit
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.9-prep.qp
2.2.5.11.3
qsnet
-#
Mon Jul 31 19:52:59 2006
+# Linux kernel version: 2.6.9-prep.qp
3.5.34.4
qsnet
+#
Sat Nov 24 21:26:14 2007
#
CONFIG_X86_64=y
CONFIG_64BIT=y
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@
-72,6
+72,7
@@
CONFIG_STOP_MACHINE=y
# CONFIG_MPSC is not set
CONFIG_GENERIC_CPU=y
# CONFIG_MEM_MIRROR is not set
# 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
CONFIG_X86_L1_CACHE_BYTES=128
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_X86_TSC=y
@@
-98,8
+99,7
@@
CONFIG_X86_MCE=y
CONFIG_X86_MCE_AMD=y
CONFIG_IOPROC=y
CONFIG_PTRACK=y
CONFIG_X86_MCE_AMD=y
CONFIG_IOPROC=y
CONFIG_PTRACK=y
-# CONFIG_X86_64_XEN is not set
-
+
#
# Power management options
#
#
# Power management options
#
@@
-469,6
+469,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_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
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@
-506,9
+507,7
@@
CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
-CONFIG_QLA3XXX=m
CONFIG_SCSI_QLA4XXX=m
CONFIG_SCSI_QLA4XXX=m
-
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_DEBUG is not set
@@
-523,7
+522,7
@@
CONFIG_SCSI_QLA4XXX=m
#
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
#
# 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
CONFIG_SATA_AHCI=m
CONFIG_SATA_SVW=m
CONFIG_ATA_PIIX=m
@@
-540,7
+539,8
@@
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
CONFIG_SATA_INTEL_COMBINED=y
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)
#
# Multi-device support (RAID and LVM)
@@
-990,6
+990,8
@@
CONFIG_ACENIC=m
CONFIG_DL2K=m
CONFIG_E1000=m
CONFIG_E1000_NAPI=y
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
CONFIG_NS83820=m
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
@@
-1001,14
+1003,17
@@
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
#
# Ethernet (10000 Mbit)
#
CONFIG_IXGB=m
CONFIG_IXGB_NAPI=y
#
# Ethernet (10000 Mbit)
#
CONFIG_IXGB=m
CONFIG_IXGB_NAPI=y
+CONFIG_CHELSIO_T3=m
CONFIG_S2IO=m
CONFIG_S2IO_NAPI=y
CONFIG_S2IO=m
CONFIG_S2IO_NAPI=y
+CONFIG_NETXEN_NIC=m
#
# Token Ring devices
#
# Token Ring devices
@@
-1021,17
+1026,6
@@
CONFIG_TMSPCI=m
CONFIG_ABYSS=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
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
@@
-1559,7
+1553,7
@@
CONFIG_VIDEO_DEV=m
#
# Video Adapters
#
#
# 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
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
@@
-1588,6
+1582,10
@@
CONFIG_VIDEO_OVCAMCHIP=m
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
# 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
#
# Graphics support
@@
-1924,19
+1922,27
@@
CONFIG_USB_SPEEDTOUCH=m
#
# InfiniBand support
#
#
# InfiniBand support
#
-# CONFIG_INFINIBAND is not set
-CONFIG_IPATH_CORE=m
-CONFIG_INFINIBAND_IPATH=m
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_MTHCA_DEBUG=y
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_IPATH=m
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
CONFIG_INFINIBAND_IPOIB=m
CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
CONFIG_INFINIBAND_SDP=m
# CONFIG_INFINIBAND_SDP_DEBUG 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_
VNIC
=m
+# CONFIG_INFINIBAND_
VNIC_DEBUG
is not set
+CONFIG_INFINIBAND_VNIC_STATS=y
CONFIG_INFINIBAND_MADEYE=m
#
CONFIG_INFINIBAND_MADEYE=m
#
@@
-1954,9
+1960,9
@@
CONFIG_EDAC_E7XXX=m
CONFIG_EDAC_E752X=m
CONFIG_EDAC_I82875P=m
CONFIG_EDAC_I82860=m
CONFIG_EDAC_E752X=m
CONFIG_EDAC_I82875P=m
CONFIG_EDAC_I82860=m
+CONFIG_EDAC_K8=m
CONFIG_EDAC_R82600=m
CONFIG_EDAC_POLL=y
CONFIG_EDAC_R82600=m
CONFIG_EDAC_POLL=y
-CONFIG_EDAC_K8=m
#
# Firmware Drivers
#
# Firmware Drivers
@@
-2163,17
+2169,13
@@
CONFIG_OPROFILE=m
CONFIG_DEBUG_KERNEL=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_DEBUG_SLAB is not set
CONFIG_DEBUG_KERNEL=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_INFO is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FRAME_POINTER_FORCE=y
CONFIG_INIT_DEBUG=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_IOMMU_DEBUG is not set
CONFIG_KPROBES=y
CONFIG_INIT_DEBUG=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_IOMMU_DEBUG is not set
CONFIG_KPROBES=y
-# CONFIG_LOCKMETER is not set
-CONFIG_PROC_SLEEP=y
#
# Security options
#
# Security options
@@
-2230,3
+2232,4
@@
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
+CONFIG_HAS_IOMEM=y