From 9e4f0079e94b54194a869c3e56b4f0cf7426f285 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Thu, 12 Nov 2009 17:31:19 +0000 Subject: [PATCH] Branch HEAD b=20773 i=adilger, shadow, girish, brian, wangyb Update kernel to RHEL5 U4. --- lustre/ChangeLog | 9 +- lustre/autoconf/lustre-core.m4 | 2 + lustre/include/lustre/ll_fiemap.h | 27 +-- .../kernel-2.6.18-2.6-oel5-i686-smp.config | 114 ++++++++++--- .../kernel-2.6.18-2.6-oel5-i686.config | 114 ++++++++++--- .../kernel-2.6.18-2.6-oel5-ia64-smp.config | 106 +++++++++--- .../kernel-2.6.18-2.6-oel5-ia64.config | 106 +++++++++--- .../kernel-2.6.18-2.6-oel5-x86_64-smp.config | 126 +++++++++++--- .../kernel-2.6.18-2.6-oel5-x86_64.config | 126 +++++++++++--- .../kernel-2.6.18-2.6-rhel5-i686-smp.config | 184 +++++++++++++++------ .../kernel-2.6.18-2.6-rhel5-i686.config | 184 +++++++++++++++------ .../kernel-2.6.18-2.6-rhel5-ia64-smp.config | 164 ++++++++++++------ .../kernel-2.6.18-2.6-rhel5-ia64.config | 164 ++++++++++++------ .../kernel-2.6.18-2.6-rhel5-x86_64-smp.config | 138 ++++++++++++---- .../kernel-2.6.18-2.6-rhel5-x86_64.config | 135 ++++++++++++--- .../patches/export-show_task-2.6.18-vanilla.patch | 6 +- .../jbd-journal-chksum-2.6.18-vanilla.patch | 2 +- .../patches/jbd2-jcberr-2.6-rhel5.patch | 16 +- .../patches/raid5-zerocopy-rhel5.patch | 4 +- lustre/kernel_patches/targets/2.6-oel5.target.in | 4 +- lustre/kernel_patches/targets/2.6-rhel5.target.in | 3 +- lustre/kernel_patches/which_patch | 6 +- lustre/llite/file.c | 27 ++- lustre/llite/llite_internal.h | 2 +- lustre/obdclass/obd_mount.c | 3 + lustre/osd/osd_handler.c | 4 +- 26 files changed, 1348 insertions(+), 428 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 6460342..b10ca8b 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,8 +2,8 @@ tbd Sun Microsystems, Inc. * version 2.0.0 * Support for kernels: 2.6.16.60-0.39.3 (SLES 10), - 2.6.18-128.7.1.el5 (RHEL 5), - 2.6.18-128.7.1.el5 (OEL 5), + 2.6.18-164.6.1.el5 (RHEL 5), + 2.6.18-164.6.1.0.1.el5 (OEL 5), 2.6.27.19-5 (SLES11) 2.6.27 vanilla (kernel.org). * Client support for unpatched kernels: @@ -14,6 +14,11 @@ tbd Sun Microsystems, Inc. * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a removed cwd "./" (refer to Bugzilla 14399). +Severity : enhancement +Bugzilla : 20773 +Description: Update kernel to RHEL5.4 2.6.18-164.6.1.el5 and + OEL5 2.6.18-164.6.1.0.1.el5(Both in-kernel OFED enabled). + Severity : normal Bugzilla : 21049 Description: Sanity test_27p fails. diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 0d62060..4322364 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1780,6 +1780,7 @@ AC_DEFUN([LC_LINUX_FIEMAP_H], [LB_CHECK_FILE([$LINUX/include/linux/fiemap.h],[ AC_MSG_CHECKING([if fiemap.h can be compiled]) LB_LINUX_TRY_COMPILE([ + #include #include ],[],[ AC_MSG_RESULT([yes]) @@ -1900,6 +1901,7 @@ AC_DEFUN([LC_PROG_LINUX], #2.6.18 + RHEL5 (fc6) LC_PG_FS_MISC LC_PAGE_CHECKED + LC_LINUX_FIEMAP_H # 2.6.19 LC_INODE_BLKSIZE diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h index 8bac0f4..265ea65 100644 --- a/lustre/include/lustre/ll_fiemap.h +++ b/lustre/include/lustre/ll_fiemap.h @@ -45,7 +45,7 @@ #ifndef _LUSTRE_FIEMAP_H #define _LUSTRE_FIEMAP_H -#ifndef HAVE_LINUX_FIEMAP_H +#if !defined(HAVE_LINUX_FIEMAP_H) || !defined(__KERNEL__) struct ll_fiemap_extent { __u64 fe_logical; /* logical offset in bytes for the start of @@ -75,11 +75,6 @@ struct ll_user_fiemap { #define FIEMAP_FLAG_SYNC 0x00000001 /* sync file data before map */ #define FIEMAP_FLAG_XATTR 0x00000002 /* map extended attribute tree */ -#define FIEMAP_FLAG_DEVICE_ORDER 0x40000000 /* return device ordered mapping */ - -#define FIEMAP_FLAGS_COMPAT (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR | \ - FIEMAP_FLAG_DEVICE_ORDER) - #define FIEMAP_EXTENT_LAST 0x00000001 /* Last extent in file. */ #define FIEMAP_EXTENT_UNKNOWN 0x00000002 /* Data location unknown. */ @@ -101,15 +96,11 @@ struct ll_user_fiemap { * support extents. Result * merged for efficiency. */ -/* Lustre specific flags - use a high bit, don't conflict with upstream flag */ -#define FIEMAP_EXTENT_NO_DIRECT 0x40000000 /* Data mapping undefined */ -#define FIEMAP_EXTENT_NET 0x80000000 /* Data stored remotely. - * Sets NO_DIRECT flag */ - #else #define ll_fiemap_extent fiemap_extent #define ll_user_fiemap fiemap +#define fe_device fe_reserved[0] #endif /* HAVE_LINUX_FIEMAP_H */ @@ -125,4 +116,18 @@ static inline unsigned fiemap_size_to_count(size_t array_size) sizeof(struct ll_fiemap_extent)); } +#define FIEMAP_FLAG_DEVICE_ORDER 0x40000000 /* return device ordered mapping */ + +#ifdef FIEMAP_FLAGS_COMPAT +#undef FIEMAP_FLAGS_COMPAT +#endif + +#define FIEMAP_FLAGS_COMPAT (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR | \ + FIEMAP_FLAG_DEVICE_ORDER) + +/* Lustre specific flags - use a high bit, don't conflict with upstream flag */ +#define FIEMAP_EXTENT_NO_DIRECT 0x40000000 /* Data mapping undefined */ +#define FIEMAP_EXTENT_NET 0x80000000 /* Data stored remotely. + * Sets NO_DIRECT flag */ + #endif /* _LUSTRE_FIEMAP_H */ diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686-smp.config index c86ff16..5810494 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Mon Aug 31 05:06:09 2009 +# Thu Nov 5 09:05:37 2009 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -36,6 +36,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -62,7 +63,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -166,8 +166,8 @@ CONFIG_TICK_DIVIDER=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -208,6 +208,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -253,7 +255,7 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y @@ -350,6 +352,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -529,8 +533,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -684,6 +690,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -772,6 +780,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -1048,7 +1057,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1159,7 +1167,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1169,12 +1179,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1199,8 +1214,12 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set +CONFIG_FCOE_FNIC=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -1221,7 +1240,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1238,6 +1257,7 @@ CONFIG_PCMCIA_FDOMAIN=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1473,6 +1493,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1485,6 +1506,7 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # @@ -1502,7 +1524,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1587,18 +1613,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2467,6 +2493,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2749,7 +2779,31 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2767,6 +2821,7 @@ CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_I82860=m CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m @@ -2805,17 +2860,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # File systems @@ -2830,10 +2897,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2858,7 +2926,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -3108,6 +3176,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3196,6 +3265,7 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config index c86ff16..5810494 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Mon Aug 31 05:06:09 2009 +# Thu Nov 5 09:05:37 2009 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -36,6 +36,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -62,7 +63,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -166,8 +166,8 @@ CONFIG_TICK_DIVIDER=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -208,6 +208,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -253,7 +255,7 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y @@ -350,6 +352,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -529,8 +533,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -684,6 +690,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -772,6 +780,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -1048,7 +1057,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1159,7 +1167,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1169,12 +1179,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1199,8 +1214,12 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set +CONFIG_FCOE_FNIC=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -1221,7 +1240,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1238,6 +1257,7 @@ CONFIG_PCMCIA_FDOMAIN=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1473,6 +1493,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1485,6 +1506,7 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # @@ -1502,7 +1524,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1587,18 +1613,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2467,6 +2493,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2749,7 +2779,31 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2767,6 +2821,7 @@ CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_I82860=m CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m @@ -2805,17 +2860,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # File systems @@ -2830,10 +2897,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2858,7 +2926,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -3108,6 +3176,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3196,6 +3265,7 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64-smp.config index 0c8934a..24a2b5f 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Mon Aug 31 05:15:27 2009 +# Thu Nov 5 09:06:18 2009 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -24,6 +24,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -49,7 +50,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -156,6 +156,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_ARCH_FLATMEM_ENABLE=y @@ -245,6 +247,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCI Hotplug Support @@ -411,8 +415,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -566,6 +572,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -654,6 +662,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -828,7 +837,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -933,7 +941,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -943,12 +953,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -971,6 +986,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -990,7 +1008,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1004,6 +1022,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1227,6 +1246,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1239,6 +1259,7 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # @@ -1256,7 +1277,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1326,18 +1351,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2132,6 +2157,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2412,7 +2441,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2451,17 +2505,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +# CONFIG_INTEL_IOATDMA_V3 is not set +CONFIG_UIO=m # # File systems @@ -2476,10 +2542,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2504,7 +2571,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2762,6 +2829,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config index 0c8934a..24a2b5f 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Mon Aug 31 05:15:27 2009 +# Thu Nov 5 09:06:18 2009 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -24,6 +24,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -49,7 +50,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -156,6 +156,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_ARCH_FLATMEM_ENABLE=y @@ -245,6 +247,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCI Hotplug Support @@ -411,8 +415,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -566,6 +572,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -654,6 +662,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -828,7 +837,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -933,7 +941,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -943,12 +953,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -971,6 +986,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -990,7 +1008,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1004,6 +1022,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1227,6 +1246,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1239,6 +1259,7 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # @@ -1256,7 +1277,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1326,18 +1351,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2132,6 +2157,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2412,7 +2441,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2451,17 +2505,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +# CONFIG_INTEL_IOATDMA_V3 is not set +CONFIG_UIO=m # # File systems @@ -2476,10 +2542,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2504,7 +2571,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2762,6 +2829,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64-smp.config index bf7d400..76f4139 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64-smp.config @@ -1,13 +1,14 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Mon Aug 31 05:11:08 2009 +# Thu Nov 5 09:02:58 2009 # CONFIG_X86_64=y CONFIG_64BIT=y CONFIG_X86=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_GET_USER_PAGES_FAST=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_MMU=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -41,6 +42,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -67,7 +69,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -137,8 +138,8 @@ CONFIG_MTRR=y CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -169,6 +170,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y CONFIG_NR_CPUS=255 CONFIG_HOTPLUG_CPU=y @@ -224,7 +227,7 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y @@ -287,12 +290,19 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_IOMMU_API=y +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_GFX_WA=y +CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCCARD (PCMCIA/CardBus) support @@ -468,8 +478,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -623,6 +635,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -711,6 +725,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -985,7 +1000,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1094,7 +1108,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1104,12 +1120,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1132,6 +1153,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set CONFIG_FCOE_FNIC=m @@ -1155,7 +1179,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1169,6 +1193,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1402,6 +1427,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1414,6 +1440,7 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # @@ -1431,7 +1458,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1515,18 +1546,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2365,6 +2396,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2647,7 +2682,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2662,6 +2722,7 @@ CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_K8=m CONFIG_EDAC_POLL=y @@ -2698,17 +2759,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # Firmware Drivers @@ -2732,10 +2805,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2744,7 +2818,11 @@ CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m @@ -2760,7 +2838,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -3000,6 +3078,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3085,6 +3164,7 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config index bf7d400..76f4139 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config @@ -1,13 +1,14 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Mon Aug 31 05:11:08 2009 +# Thu Nov 5 09:02:58 2009 # CONFIG_X86_64=y CONFIG_64BIT=y CONFIG_X86=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_GET_USER_PAGES_FAST=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_MMU=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -41,6 +42,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -67,7 +69,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -137,8 +138,8 @@ CONFIG_MTRR=y CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -169,6 +170,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y CONFIG_NR_CPUS=255 CONFIG_HOTPLUG_CPU=y @@ -224,7 +227,7 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y @@ -287,12 +290,19 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_IOMMU_API=y +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_GFX_WA=y +CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCCARD (PCMCIA/CardBus) support @@ -468,8 +478,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -623,6 +635,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -711,6 +725,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -985,7 +1000,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1094,7 +1108,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1104,12 +1120,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1132,6 +1153,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set CONFIG_FCOE_FNIC=m @@ -1155,7 +1179,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1169,6 +1193,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1402,6 +1427,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1414,6 +1440,7 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # @@ -1431,7 +1458,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1515,18 +1546,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2365,6 +2396,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2647,7 +2682,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2662,6 +2722,7 @@ CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_K8=m CONFIG_EDAC_POLL=y @@ -2698,17 +2759,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # Firmware Drivers @@ -2732,10 +2805,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2744,7 +2818,11 @@ CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m @@ -2760,7 +2838,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -3000,6 +3078,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3085,6 +3164,7 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config index e2687e1..5810494 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Jan 22 12:00:56 2009 +# Thu Nov 5 09:05:37 2009 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -36,6 +36,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -47,7 +48,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_UID16=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -62,7 +63,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -166,8 +166,8 @@ CONFIG_TICK_DIVIDER=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -192,7 +192,8 @@ CONFIG_EDD=m CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set @@ -207,6 +208,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -252,13 +255,12 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_ASUS=m -CONFIG_ACPI_IBM=m -CONFIG_ACPI_IBM_BAY=y +# CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=1999 # CONFIG_ACPI_DEBUG is not set @@ -309,10 +311,10 @@ CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y # CONFIG_X86_GX_SUSPMOD is not set -CONFIG_X86_SPEEDSTEP_CENTRINO=y +CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y CONFIG_X86_SPEEDSTEP_ICH=y @@ -350,6 +352,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -498,7 +502,7 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -529,8 +533,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -684,6 +690,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -772,6 +780,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -840,14 +849,7 @@ CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -CONFIG_MAC80211_DEBUG=y -# CONFIG_MAC80211_HT_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_DEBUG is not set -# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set -# CONFIG_TKIP_DEBUG is not set -# CONFIG_MAC80211_DEBUG_COUNTERS is not set -# CONFIG_MAC80211_IBSS_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -1055,7 +1057,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1166,22 +1167,29 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1206,8 +1214,12 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set +CONFIG_FCOE_FNIC=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -1228,7 +1240,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1245,6 +1257,7 @@ CONFIG_PCMCIA_FDOMAIN=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1266,7 +1279,7 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m +# CONFIG_PATA_ACPI is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1276,7 +1289,7 @@ CONFIG_PATA_ACPI=m # CONFIG_PATA_CS5520 is not set # CONFIG_PATA_CS5530 is not set # CONFIG_PATA_CS5535 is not set -CONFIG_PATA_CS5536=m +# CONFIG_PATA_CS5536 is not set # CONFIG_PATA_CYPRESS is not set # CONFIG_PATA_EFAR is not set # CONFIG_ATA_GENERIC is not set @@ -1294,7 +1307,7 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NINJA32 is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m +# CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1304,7 +1317,7 @@ CONFIG_PATA_NS87415=m # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set CONFIG_PATA_PDC2027X=m -# CONFIG_PATA_SIL680 is not set +CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=m # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set @@ -1334,7 +1347,7 @@ CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m CONFIG_DM_MULTIPATH_HP=m CONFIG_DM_RAID45=m -# CONFIG_DM_UEVENT is not set +CONFIG_DM_UEVENT=y # # Fusion MPT device support @@ -1343,10 +1356,10 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # Enable only one of the two stacks, unless you know what you are doing @@ -1458,7 +1471,8 @@ CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_SIS900=m CONFIG_EPIC100=m -# CONFIG_SUNDANCE is not set +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y @@ -1479,6 +1493,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1491,13 +1506,14 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1508,7 +1524,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1593,15 +1613,19 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y -# CONFIG_IWL3945 is not set +CONFIG_IWL3945=m +# CONFIG_IWL3945_RFKILL is not set +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +CONFIG_IWL3945_LEDS=y +# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_PCI=m @@ -1973,7 +1997,8 @@ CONFIG_PPDEV=m # IPMI # CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_PANIC_EVENT=y +CONFIG_IPMI_PANIC_STRING=y CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m @@ -2000,7 +2025,7 @@ CONFIG_IBMASR=m # CONFIG_WAFER_WDT is not set CONFIG_I6300ESB_WDT=m CONFIG_I8XX_TCO=m -CONFIG_HP_WATCHDOG=m +# CONFIG_HP_WATCHDOG is not set # CONFIG_SC1200_WDT is not set # CONFIG_60XX_WDT is not set # CONFIG_SBC8360_WDT is not set @@ -2076,8 +2101,12 @@ CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m # # I2C support @@ -2318,7 +2347,7 @@ CONFIG_FB_CIRRUS=m # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m CONFIG_FB_VESA=y -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_IMAC is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set @@ -2464,6 +2493,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2746,7 +2779,31 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2764,6 +2821,7 @@ CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_I82860=m CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m @@ -2802,17 +2860,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # File systems @@ -2827,10 +2897,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2855,7 +2926,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2959,8 +3030,9 @@ 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_CIFS_EXPERIMENTAL=y CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -3073,7 +3145,7 @@ CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_VM is not set CONFIG_DEBUG_LIST=y -CONFIG_FRAME_POINTER=y +# CONFIG_FRAME_POINTER is not set # CONFIG_FORCED_INLINING is not set CONFIG_BOOT_DELAY=y # CONFIG_RCU_TORTURE_TEST is not set @@ -3104,6 +3176,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3157,7 +3230,7 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y @@ -3192,6 +3265,7 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config index e2687e1..5810494 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Jan 22 12:00:56 2009 +# Thu Nov 5 09:05:37 2009 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -36,6 +36,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -47,7 +48,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_UID16=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -62,7 +63,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -166,8 +166,8 @@ CONFIG_TICK_DIVIDER=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -192,7 +192,8 @@ CONFIG_EDD=m CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set @@ -207,6 +208,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -252,13 +255,12 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_ASUS=m -CONFIG_ACPI_IBM=m -CONFIG_ACPI_IBM_BAY=y +# CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=1999 # CONFIG_ACPI_DEBUG is not set @@ -309,10 +311,10 @@ CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y # CONFIG_X86_GX_SUSPMOD is not set -CONFIG_X86_SPEEDSTEP_CENTRINO=y +CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y CONFIG_X86_SPEEDSTEP_ICH=y @@ -350,6 +352,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -498,7 +502,7 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -529,8 +533,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -684,6 +690,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -772,6 +780,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -840,14 +849,7 @@ CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -CONFIG_MAC80211_DEBUG=y -# CONFIG_MAC80211_HT_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_DEBUG is not set -# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set -# CONFIG_TKIP_DEBUG is not set -# CONFIG_MAC80211_DEBUG_COUNTERS is not set -# CONFIG_MAC80211_IBSS_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -1055,7 +1057,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1166,22 +1167,29 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1206,8 +1214,12 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set +CONFIG_FCOE_FNIC=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -1228,7 +1240,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1245,6 +1257,7 @@ CONFIG_PCMCIA_FDOMAIN=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1266,7 +1279,7 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m +# CONFIG_PATA_ACPI is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1276,7 +1289,7 @@ CONFIG_PATA_ACPI=m # CONFIG_PATA_CS5520 is not set # CONFIG_PATA_CS5530 is not set # CONFIG_PATA_CS5535 is not set -CONFIG_PATA_CS5536=m +# CONFIG_PATA_CS5536 is not set # CONFIG_PATA_CYPRESS is not set # CONFIG_PATA_EFAR is not set # CONFIG_ATA_GENERIC is not set @@ -1294,7 +1307,7 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NINJA32 is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m +# CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1304,7 +1317,7 @@ CONFIG_PATA_NS87415=m # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set CONFIG_PATA_PDC2027X=m -# CONFIG_PATA_SIL680 is not set +CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=m # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set @@ -1334,7 +1347,7 @@ CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m CONFIG_DM_MULTIPATH_HP=m CONFIG_DM_RAID45=m -# CONFIG_DM_UEVENT is not set +CONFIG_DM_UEVENT=y # # Fusion MPT device support @@ -1343,10 +1356,10 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # Enable only one of the two stacks, unless you know what you are doing @@ -1458,7 +1471,8 @@ CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_SIS900=m CONFIG_EPIC100=m -# CONFIG_SUNDANCE is not set +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y @@ -1479,6 +1493,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1491,13 +1506,14 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1508,7 +1524,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1593,15 +1613,19 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y -# CONFIG_IWL3945 is not set +CONFIG_IWL3945=m +# CONFIG_IWL3945_RFKILL is not set +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +CONFIG_IWL3945_LEDS=y +# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_PCI=m @@ -1973,7 +1997,8 @@ CONFIG_PPDEV=m # IPMI # CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_PANIC_EVENT=y +CONFIG_IPMI_PANIC_STRING=y CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m @@ -2000,7 +2025,7 @@ CONFIG_IBMASR=m # CONFIG_WAFER_WDT is not set CONFIG_I6300ESB_WDT=m CONFIG_I8XX_TCO=m -CONFIG_HP_WATCHDOG=m +# CONFIG_HP_WATCHDOG is not set # CONFIG_SC1200_WDT is not set # CONFIG_60XX_WDT is not set # CONFIG_SBC8360_WDT is not set @@ -2076,8 +2101,12 @@ CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m # # I2C support @@ -2318,7 +2347,7 @@ CONFIG_FB_CIRRUS=m # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m CONFIG_FB_VESA=y -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_IMAC is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set @@ -2464,6 +2493,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2746,7 +2779,31 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2764,6 +2821,7 @@ CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_I82860=m CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m @@ -2802,17 +2860,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # File systems @@ -2827,10 +2897,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2855,7 +2926,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2959,8 +3030,9 @@ 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_CIFS_EXPERIMENTAL=y CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -3073,7 +3145,7 @@ CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_VM is not set CONFIG_DEBUG_LIST=y -CONFIG_FRAME_POINTER=y +# CONFIG_FRAME_POINTER is not set # CONFIG_FORCED_INLINING is not set CONFIG_BOOT_DELAY=y # CONFIG_RCU_TORTURE_TEST is not set @@ -3104,6 +3176,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3157,7 +3230,7 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y @@ -3192,6 +3265,7 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config index a272203..24a2b5f 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Jan 22 12:02:35 2009 +# Thu Nov 5 09:06:18 2009 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -24,6 +24,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -34,7 +35,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set CONFIG_SYSCTL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -49,7 +50,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -156,6 +156,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_ARCH_FLATMEM_ENABLE=y @@ -170,7 +172,7 @@ CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_SGI_SN=y -# CONFIG_IA64_HP_AML_NFW is not set +CONFIG_IA64_HP_AML_NFW=y # # SN Devices @@ -245,6 +247,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCI Hotplug Support @@ -380,7 +384,7 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -411,8 +415,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -566,6 +572,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -654,6 +662,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -722,16 +731,9 @@ CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -CONFIG_MAC80211_DEBUG=y -# CONFIG_MAC80211_HT_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_DEBUG is not set -# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set -# CONFIG_TKIP_DEBUG is not set -# CONFIG_MAC80211_DEBUG_COUNTERS is not set -# CONFIG_MAC80211_IBSS_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m @@ -835,7 +837,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -940,22 +941,29 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -978,6 +986,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -997,7 +1008,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1011,6 +1022,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1032,7 +1044,7 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m +# CONFIG_PATA_ACPI is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1058,7 +1070,7 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NINJA32 is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m +# CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1068,7 +1080,7 @@ CONFIG_PATA_NS87415=m # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set CONFIG_PATA_PDC2027X=m -# CONFIG_PATA_SIL680 is not set +CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=m # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set @@ -1098,7 +1110,7 @@ CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m CONFIG_DM_MULTIPATH_HP=m CONFIG_DM_RAID45=m -# CONFIG_DM_UEVENT is not set +CONFIG_DM_UEVENT=y # # Fusion MPT device support @@ -1107,10 +1119,10 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # Enable only one of the two stacks, unless you know what you are doing @@ -1214,7 +1226,8 @@ CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_SIS900=m CONFIG_EPIC100=m -# CONFIG_SUNDANCE is not set +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_NAPI=y @@ -1233,6 +1246,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1245,13 +1259,14 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1262,7 +1277,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1332,15 +1351,19 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y -# CONFIG_IWL3945 is not set +CONFIG_IWL3945=m +# CONFIG_IWL3945_RFKILL is not set +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +CONFIG_IWL3945_LEDS=y +# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_PCI=m @@ -1701,7 +1724,8 @@ CONFIG_PPDEV=m # IPMI # CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_PANIC_EVENT=y +CONFIG_IPMI_PANIC_STRING=y CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m @@ -1765,8 +1789,12 @@ CONFIG_MAX_RAW_DEVS=8192 # CONFIG_HPET is not set CONFIG_HANGCHECK_TIMER=m CONFIG_MMTIMER=y -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +# CONFIG_TCG_INFINEON is not set +CONFIG_TELCLOCK=m # # I2C support @@ -1791,7 +1819,7 @@ CONFIG_I2C_ALGOPCA=m # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set -# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_PIIX4=m CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_OCORES is not set @@ -2129,6 +2157,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2409,7 +2441,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2448,17 +2505,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +# CONFIG_INTEL_IOATDMA_V3 is not set +CONFIG_UIO=m # # File systems @@ -2473,10 +2542,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2501,7 +2571,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2595,8 +2665,9 @@ 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_CIFS_EXPERIMENTAL=y CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -2758,6 +2829,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -2810,7 +2882,7 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config index a272203..24a2b5f 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Jan 22 12:02:35 2009 +# Thu Nov 5 09:06:18 2009 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -24,6 +24,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -34,7 +35,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set CONFIG_SYSCTL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -49,7 +50,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -156,6 +156,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_ARCH_FLATMEM_ENABLE=y @@ -170,7 +172,7 @@ CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_SGI_SN=y -# CONFIG_IA64_HP_AML_NFW is not set +CONFIG_IA64_HP_AML_NFW=y # # SN Devices @@ -245,6 +247,8 @@ CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCI Hotplug Support @@ -380,7 +384,7 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -411,8 +415,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -566,6 +572,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -654,6 +662,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -722,16 +731,9 @@ CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -CONFIG_MAC80211_DEBUG=y -# CONFIG_MAC80211_HT_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_DEBUG is not set -# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set -# CONFIG_TKIP_DEBUG is not set -# CONFIG_MAC80211_DEBUG_COUNTERS is not set -# CONFIG_MAC80211_IBSS_DEBUG is not set -# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m @@ -835,7 +837,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -940,22 +941,29 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -978,6 +986,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -997,7 +1008,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1011,6 +1022,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1032,7 +1044,7 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m +# CONFIG_PATA_ACPI is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1058,7 +1070,7 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NINJA32 is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m +# CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1068,7 +1080,7 @@ CONFIG_PATA_NS87415=m # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set CONFIG_PATA_PDC2027X=m -# CONFIG_PATA_SIL680 is not set +CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=m # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set @@ -1098,7 +1110,7 @@ CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m CONFIG_DM_MULTIPATH_HP=m CONFIG_DM_RAID45=m -# CONFIG_DM_UEVENT is not set +CONFIG_DM_UEVENT=y # # Fusion MPT device support @@ -1107,10 +1119,10 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # Enable only one of the two stacks, unless you know what you are doing @@ -1214,7 +1226,8 @@ CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_SIS900=m CONFIG_EPIC100=m -# CONFIG_SUNDANCE is not set +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_NAPI=y @@ -1233,6 +1246,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1245,13 +1259,14 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1262,7 +1277,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1332,15 +1351,19 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y -# CONFIG_IWL3945 is not set +CONFIG_IWL3945=m +# CONFIG_IWL3945_RFKILL is not set +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +CONFIG_IWL3945_LEDS=y +# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_PCI=m @@ -1701,7 +1724,8 @@ CONFIG_PPDEV=m # IPMI # CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_PANIC_EVENT=y +CONFIG_IPMI_PANIC_STRING=y CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m @@ -1765,8 +1789,12 @@ CONFIG_MAX_RAW_DEVS=8192 # CONFIG_HPET is not set CONFIG_HANGCHECK_TIMER=m CONFIG_MMTIMER=y -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +# CONFIG_TCG_INFINEON is not set +CONFIG_TELCLOCK=m # # I2C support @@ -1791,7 +1819,7 @@ CONFIG_I2C_ALGOPCA=m # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set -# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_PIIX4=m CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_OCORES is not set @@ -2129,6 +2157,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2409,7 +2441,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2448,17 +2505,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +# CONFIG_INTEL_IOATDMA_V3 is not set +CONFIG_UIO=m # # File systems @@ -2473,10 +2542,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2501,7 +2571,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2595,8 +2665,9 @@ 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_CIFS_EXPERIMENTAL=y CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -2758,6 +2829,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -2810,7 +2882,7 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config index 7bfdd3a..76f4139 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config @@ -1,13 +1,14 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Wed Jun 4 07:25:06 2008 +# Thu Nov 5 09:02:58 2009 # CONFIG_X86_64=y CONFIG_64BIT=y CONFIG_X86=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_GET_USER_PAGES_FAST=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_MMU=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -41,6 +42,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -52,7 +54,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_UID16=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -67,7 +69,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -137,8 +138,8 @@ CONFIG_MTRR=y CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -169,6 +170,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y CONFIG_NR_CPUS=255 CONFIG_HOTPLUG_CPU=y @@ -224,7 +227,7 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y @@ -287,12 +290,19 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_IOMMU_API=y +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_GFX_WA=y +CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCCARD (PCMCIA/CardBus) support @@ -468,8 +478,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -623,6 +635,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -711,6 +725,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -985,7 +1000,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1094,7 +1108,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1104,12 +1120,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1132,6 +1153,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set CONFIG_FCOE_FNIC=m @@ -1155,7 +1179,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1169,6 +1193,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1265,8 +1290,7 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=256 -CONFIG_FUSION_MAX_FC_SGE=256 +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m CONFIG_FUSION_LOGGING=y @@ -1403,6 +1427,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1415,13 +1440,14 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1432,7 +1458,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1516,18 +1546,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2366,6 +2396,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2648,7 +2682,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2663,6 +2722,7 @@ CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_K8=m CONFIG_EDAC_POLL=y @@ -2699,17 +2759,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # Firmware Drivers @@ -2717,7 +2789,8 @@ CONFIG_INTEL_IOATDMA=m CONFIG_EDD=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # # File systems @@ -2732,10 +2805,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2744,7 +2818,11 @@ CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m @@ -2760,7 +2838,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2977,7 +3055,7 @@ CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_VM is not set CONFIG_DEBUG_LIST=y -CONFIG_FRAME_POINTER=y +# CONFIG_FRAME_POINTER is not set # CONFIG_FORCED_INLINING is not set CONFIG_BOOT_DELAY=y # CONFIG_RCU_TORTURE_TEST is not set @@ -3000,6 +3078,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3085,6 +3164,7 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config index 15d7d0e..76f4139 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config @@ -1,13 +1,14 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Jan 22 11:53:40 2009 +# Thu Nov 5 09:02:58 2009 # CONFIG_X86_64=y CONFIG_64BIT=y CONFIG_X86=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_GET_USER_PAGES_FAST=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_MMU=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -41,6 +42,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -52,7 +54,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_UID16=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -67,7 +69,6 @@ CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y -CONFIG_TRACEPROBES=m CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -137,8 +138,8 @@ CONFIG_MTRR=y CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -169,6 +170,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y CONFIG_NR_CPUS=255 CONFIG_HOTPLUG_CPU=y @@ -224,7 +227,7 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=y +# CONFIG_ACPI_BAY is not set CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y @@ -287,12 +290,19 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_IOMMU_API=y +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_GFX_WA=y +CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCCARD (PCMCIA/CardBus) support @@ -468,8 +478,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -623,6 +635,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -711,6 +725,7 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set CONFIG_BT=m @@ -985,7 +1000,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1094,7 +1108,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1104,12 +1120,17 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1132,6 +1153,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set CONFIG_FCOE_FNIC=m @@ -1155,7 +1179,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set @@ -1169,6 +1193,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1402,6 +1427,7 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1414,13 +1440,14 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1431,7 +1458,11 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m # # Token Ring devices @@ -1515,18 +1546,18 @@ CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLCORE=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_RFKILL is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set +CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -# CONFIG_IWL3945_LEDS is not set +CONFIG_IWL3945_LEDS=y # CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m CONFIG_RT2X00_LIB=m @@ -2365,6 +2396,10 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2647,7 +2682,32 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=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_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2662,6 +2722,7 @@ CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5400=m CONFIG_EDAC_K8=m CONFIG_EDAC_POLL=y @@ -2698,17 +2759,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m # -# DMA Clients +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m + +# +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_UIO=m # # Firmware Drivers @@ -2716,7 +2789,8 @@ CONFIG_INTEL_IOATDMA=m CONFIG_EDD=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # # File systems @@ -2731,10 +2805,11 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2743,7 +2818,11 @@ CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m @@ -2759,7 +2838,7 @@ CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # Caches @@ -2976,7 +3055,7 @@ CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_VM is not set CONFIG_DEBUG_LIST=y -CONFIG_FRAME_POINTER=y +# CONFIG_FRAME_POINTER is not set # CONFIG_FORCED_INLINING is not set CONFIG_BOOT_DELAY=y # CONFIG_RCU_TORTURE_TEST is not set @@ -2999,6 +3078,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3084,6 +3164,7 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch index a01aaaf..2a69694 100644 --- a/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch +++ b/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch @@ -16,12 +16,8 @@ Index: linux-2.6/kernel/sched.c { struct task_struct *relative; unsigned long free = 0; -@@ -4698,9 +4698,10 @@ static void show_task(struct task_struct - else - printk(" (NOTLB)\n"); +@@ -4698,6 +4698,7 @@ static void show_task(struct task_struct -- if (state != TASK_RUNNING) -+ if (state != TASK_RUNNING || p == current) show_stack(p, NULL); } +EXPORT_SYMBOL(show_task); diff --git a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch index 49ed3de..5f26c0b 100644 --- a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch +++ b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch @@ -223,7 +223,7 @@ Index: linux-2.6.18-128.1.6/fs/jbd/commit.c - } else { - jbd_unlock_bh_state(bh); - } -- put_bh(bh); +- release_data_buffer(bh); - cond_resched_lock(&journal->j_list_lock); - } + if (!JFS_HAS_INCOMPAT_FEATURE(journal, diff --git a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch index 476e06f..2933591 100644 --- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch +++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch @@ -74,9 +74,9 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h + * Called when the transaction is committed. [t_jcb_lock] + */ + struct list_head t_jcb; - }; - - struct transaction_run_stats_s { + /* + * For use by the filesystem to store fs-specific data + * structures associated with the transaction @@ -1018,6 +1058,9 @@ extern int jbd2_journal_flush (journal_t *); extern void jbd2_journal_lock_updates (journal_t *); @@ -139,9 +139,9 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/journal.c --- linux-2.6.18-128.1.6.orig/fs/jbd2/journal.c 2009-04-15 08:35:28.000000000 +0530 +++ linux-2.6.18-128.1.6/fs/jbd2/journal.c 2009-05-28 17:13:35.000000000 +0530 @@ -80,6 +80,9 @@ - EXPORT_SYMBOL(jbd2_journal_invalidatepage); - EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers); - EXPORT_SYMBOL(jbd2_journal_force_commit); + EXPORT_SYMBOL(jbd2_journal_init_jbd_inode); + EXPORT_SYMBOL(jbd2_journal_release_jbd_inode); + EXPORT_SYMBOL(jbd2_journal_begin_ordered_truncate); +EXPORT_SYMBOL(jbd2_journal_callback_set); +EXPORT_SYMBOL(jbd2_journal_bmap); +EXPORT_SYMBOL(jbd2_log_start_commit); @@ -153,9 +153,9 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/transaction.c --- linux-2.6.18-128.1.6.orig/fs/jbd2/transaction.c 2009-04-15 08:35:28.000000000 +0530 +++ linux-2.6.18-128.1.6/fs/jbd2/transaction.c 2009-05-28 15:11:28.000000000 +0530 @@ -51,6 +51,9 @@ - transaction->t_tid = journal->j_transaction_sequence++; - transaction->t_expires = jiffies + journal->j_commit_interval; spin_lock_init(&transaction->t_handle_lock); + INIT_LIST_HEAD(&transaction->t_inode_list); + INIT_LIST_HEAD(&transaction->t_private_list); + INIT_LIST_HEAD(&transaction->t_jcb); + spin_lock_init(&transaction->t_jcb_lock); + diff --git a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch index 51b48cb..06db94d 100644 --- a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch +++ b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch @@ -428,9 +428,9 @@ Index: linux-2.6.18-128.1.6/mm/filemap.c #include #include +#include - #include "filemap.h" + #include /* for BUG_ON(!in_atomic()) only */ + #include #include "internal.h" - @@ -567,11 +568,55 @@ if (!test_clear_page_writeback(page)) BUG(); diff --git a/lustre/kernel_patches/targets/2.6-oel5.target.in b/lustre/kernel_patches/targets/2.6-oel5.target.in index f563eb5..4e44cd8 100644 --- a/lustre/kernel_patches/targets/2.6-oel5.target.in +++ b/lustre/kernel_patches/targets/2.6-oel5.target.in @@ -1,12 +1,12 @@ lnxmaj="2.6.18" -lnxrel="128.7.1.0.1.el5" +lnxrel="164.6.1.0.1.el5" KERNEL_SRPM=kernel-$lnxmaj-$lnxrel.src.rpm SERIES=2.6-rhel5.series EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ LUSTRE_VERSION=@VERSION@ -OFED_VERSION=1.4.1 +OFED_VERSION=inkernel BASE_ARCHS="i686 x86_64 ia64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index a21e014..ec1124d 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -1,12 +1,11 @@ lnxmaj="2.6.18" -lnxrel="128.7.1.el5" +lnxrel="164.6.1.el5" KERNEL_SRPM=kernel-$lnxmaj-$lnxrel.src.rpm SERIES=2.6-rhel5.series EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ LUSTRE_VERSION=@VERSION@ -OFED_VERSION=1.4.2 BASE_ARCHS="i686 x86_64 ia64 ppc64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 067d0e6..696115b 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,11 +1,9 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel4 RHEL4: 2.6.9-67.0.20.EL 2.6-sles10 SLES10: 2.6.16.60-0.39.3 -2.6-rhel5 RHEL5: 2.6.18-128.7.1.el5 -2.6-rhel5 OEL5: 2.6.18-128.7.1.el5 -2.6.18-vanilla kernel.org: 2.6.18.8 +2.6-rhel5 RHEL5: 2.6.18-164.6.1.el5 +2.6-rhel5 OEL5: 2.6.18-164.6.1.0.1.el5 2.6.22-vanilla kernel.org: 2.6.22.14 2.6-sles11 SLES11: 2.6.27.23-0.1 diff --git a/lustre/llite/file.c b/lustre/llite/file.c index 8fdc7f0..1bc7e0b 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -1533,7 +1533,7 @@ int ll_release_openhandle(struct dentry *dentry, struct lookup_intent *it) * Get size for inode for which FIEMAP mapping is requested. * Make the FIEMAP get_info call and returns the result. */ -int ll_fiemap(struct inode *inode, struct ll_user_fiemap *fiemap, +int ll_do_fiemap(struct inode *inode, struct ll_user_fiemap *fiemap, int num_bytes) { struct obd_export *exp = ll_i2dtexp(inode); @@ -1706,7 +1706,7 @@ int ll_file_ioctl(struct inode *inode, struct file *file, unsigned int cmd, GOTO(error, rc); } - rc = ll_fiemap(inode, fiemap_s, num_bytes); + rc = ll_do_fiemap(inode, fiemap_s, num_bytes); if (rc) GOTO(error, rc); @@ -2204,6 +2204,26 @@ int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat) return ll_getattr_it(mnt, de, &it, stat); } +#ifdef HAVE_LINUX_FIEMAP_H +int ll_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + __u64 start, __u64 len) +{ + int rc; + struct ll_user_fiemap *fiemap = (struct ll_user_fiemap*)( + fieinfo->fi_extents_start - sizeof(ll_user_fiemap)); + + rc = ll_do_fiemap(inode, fiemap, sizeof(*fiemap) + + fiemap->fm_extent_count * + sizeof(struct ll_fiemap_extent)); + + fieinfo->fi_flags = fiemap->fm_flags; + fieinfo->fi_extents_mapped = fiemap->fm_mapped_extents; + + return rc; +} +#endif + + static int lustre_check_acl(struct inode *inode, int mask) { @@ -2405,6 +2425,9 @@ struct inode_operations ll_file_inode_operations = { .getxattr = ll_getxattr, .listxattr = ll_listxattr, .removexattr = ll_removexattr, +#ifdef HAVE_LINUX_FIEMAP_H + .fiemap = ll_fiemap, +#endif }; /* dynamic ioctl number support routins */ diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index 0679056..099c62c 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -657,7 +657,7 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump, int ll_dir_getstripe(struct inode *inode, struct lov_mds_md **lmm, int *lmm_size, struct ptlrpc_request **request); int ll_fsync(struct file *file, struct dentry *dentry, int data); -int ll_fiemap(struct inode *inode, struct ll_user_fiemap *fiemap, +int ll_do_fiemap(struct inode *inode, struct ll_user_fiemap *fiemap, int num_bytes); int ll_merge_lvb(struct inode *inode); int ll_get_grouplock(struct inode *inode, struct file *file, unsigned long arg); diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index e89a4d4..0c87eac 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -2124,6 +2124,9 @@ struct file_system_type lustre_fs_type = { .get_sb = lustre_get_sb, .kill_sb = lustre_kill_super, .fs_flags = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV | +#ifdef HAVE_LINUX_FIEMAP_H + FS_HAS_FIEMAP | +#endif LL_RENAME_DOES_D_MOVE, }; diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c index cb3c654..990341f 100644 --- a/lustre/osd/osd_handler.c +++ b/lustre/osd/osd_handler.c @@ -2480,7 +2480,7 @@ static int osd_index_ea_delete(const struct lu_env *env, struct dt_object *dt, (char *)key, strlen((char *)key)); down_write(&obj->oo_ext_idx_sem); - bh = ldiskfs_find_entry(dentry, &de); + bh = ll_ldiskfs_find_entry(dir, dentry, &de); if (bh) { struct osd_thread_info *oti = osd_oti_get(env); struct timespec *ctime = &oti->oti_time; @@ -2753,7 +2753,7 @@ static int osd_ea_lookup_rec(const struct lu_env *env, struct osd_object *obj, (char *)key, strlen((char *)key)); down_read(&obj->oo_ext_idx_sem); - bh = ldiskfs_find_entry(dentry, &de); + bh = ll_ldiskfs_find_entry(dir, dentry, &de); if (bh) { ino = le32_to_cpu(de->inode); brelse(bh); -- 1.8.3.1