From 5d2e5e178b0644321210f50bbe5c8b45500429b3 Mon Sep 17 00:00:00 2001 From: johann Date: Tue, 22 Jul 2008 21:40:06 +0000 Subject: [PATCH] Branch HEAD b=16190 revert attachment 17583 (kernel config file updates) since attachment 17582 has already been backed out due to incompatibility with OFED 1.3.1. --- .../kernel-2.6.18-2.6-rhel5-i686-smp.config | 53 +++++----------------- .../kernel-2.6.18-2.6-rhel5-i686.config | 53 +++++----------------- .../kernel-2.6.18-2.6-rhel5-ia64-smp.config | 47 +++++-------------- .../kernel-2.6.18-2.6-rhel5-ia64.config | 47 +++++-------------- .../kernel-2.6.18-2.6-rhel5-x86_64-smp.config | 49 ++++---------------- .../kernel-2.6.18-2.6-rhel5-x86_64.config | 49 ++++---------------- 6 files changed, 66 insertions(+), 232 deletions(-) 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 ceb6da3..2672612 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 -# Fri Jun 27 01:40:54 2008 +# Sat Nov 24 08:00:02 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -187,7 +187,6 @@ CONFIG_EDD=m CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set @@ -398,7 +397,6 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -CONFIG_XFRM_NALGO=m CONFIG_XFRM_USER=y CONFIG_NET_KEY=m CONFIG_INET=y @@ -483,7 +481,6 @@ 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_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -801,15 +798,12 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_MAC80211=m -CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS 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 @@ -1135,7 +1129,6 @@ CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_ISCSI_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # @@ -1226,7 +1219,6 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1236,7 +1228,6 @@ 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_CYPRESS is not set # CONFIG_PATA_EFAR is not set # CONFIG_ATA_GENERIC is not set @@ -1253,7 +1244,6 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1290,8 +1280,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -# CONFIG_DM_UEVENT is not set # # Fusion MPT device support @@ -1303,7 +1291,6 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m @@ -1451,15 +1438,12 @@ CONFIG_QLA3XXX=m # CONFIG_CHELSIO_T1=m # CONFIG_CHELSIO_T3 is not set -CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m -CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1538,11 +1522,9 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWL4965=m -# CONFIG_IWL4965_QOS is not set -# CONFIG_IWL4965_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWL4965_SENSITIVITY is not set -# CONFIG_IWL4965_DEBUG is not set # CONFIG_IWL3945 is not set # @@ -1922,7 +1904,6 @@ CONFIG_IBMASR=m # CONFIG_WAFER_WDT is not set CONFIG_I6300ESB_WDT=m CONFIG_I8XX_TCO=m -CONFIG_HP_WATCHDOG=m # CONFIG_SC1200_WDT is not set # CONFIG_60XX_WDT is not set # CONFIG_SBC8360_WDT is not set @@ -1998,6 +1979,10 @@ CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m + +# +# TPM devices +# # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set @@ -2529,7 +2514,6 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -2661,6 +2645,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m + +# +# InfiniBand support +# # CONFIG_INFINIBAND is not set # @@ -2677,8 +2665,6 @@ CONFIG_EDAC_AMD76X=m CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I5000=m CONFIG_EDAC_I82860=m CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m @@ -2811,7 +2797,6 @@ CONFIG_CONFIGFS_FS=m # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -2971,7 +2956,6 @@ CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -3023,16 +3007,7 @@ CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_API=m -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NHMAC=m -CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -3041,10 +3016,6 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -3061,7 +3032,6 @@ CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y @@ -3082,6 +3052,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 903bc6c..a451029 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 -# Fri Jun 27 01:41:47 2008 +# Sat Nov 24 08:01:09 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -178,7 +178,6 @@ CONFIG_EDD=m CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set @@ -386,7 +385,6 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -CONFIG_XFRM_NALGO=m CONFIG_XFRM_USER=y CONFIG_NET_KEY=m CONFIG_INET=y @@ -471,7 +469,6 @@ 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_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -789,15 +786,12 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_MAC80211=m -CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS 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 @@ -1123,7 +1117,6 @@ CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_ISCSI_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # @@ -1214,7 +1207,6 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1224,7 +1216,6 @@ 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_CYPRESS is not set # CONFIG_PATA_EFAR is not set # CONFIG_ATA_GENERIC is not set @@ -1241,7 +1232,6 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1278,8 +1268,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -# CONFIG_DM_UEVENT is not set # # Fusion MPT device support @@ -1291,7 +1279,6 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m @@ -1440,15 +1427,12 @@ CONFIG_QLA3XXX=m # CONFIG_CHELSIO_T1=m # CONFIG_CHELSIO_T3 is not set -CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m -CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1527,11 +1511,9 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWL4965=m -# CONFIG_IWL4965_QOS is not set -# CONFIG_IWL4965_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWL4965_SENSITIVITY is not set -# CONFIG_IWL4965_DEBUG is not set # CONFIG_IWL3945 is not set # @@ -1914,7 +1896,6 @@ CONFIG_IBMASR=m # CONFIG_WAFER_WDT is not set CONFIG_I6300ESB_WDT=m CONFIG_I8XX_TCO=m -CONFIG_HP_WATCHDOG=m # CONFIG_SC1200_WDT is not set # CONFIG_60XX_WDT is not set # CONFIG_SBC8360_WDT is not set @@ -1991,6 +1972,10 @@ CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m + +# +# TPM devices +# # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set @@ -2522,7 +2507,6 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -2654,6 +2638,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m + +# +# InfiniBand support +# # CONFIG_INFINIBAND is not set # @@ -2670,8 +2658,6 @@ CONFIG_EDAC_AMD76X=m CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I5000=m CONFIG_EDAC_I82860=m CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m @@ -2804,7 +2790,6 @@ CONFIG_CONFIGFS_FS=m # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -2964,7 +2949,6 @@ CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -3014,16 +2998,7 @@ CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_API=m -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NHMAC=m -CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -3032,10 +3007,6 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -3052,7 +3023,6 @@ CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y @@ -3073,6 +3043,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 125e389..e866d45 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 -# Fri Jun 27 01:42:44 2008 +# Sat Nov 24 07:57:21 2007 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -166,7 +166,6 @@ CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_SGI_SN=y -# CONFIG_IA64_HP_AML_NFW is not set # # SN Devices @@ -290,7 +289,6 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -CONFIG_XFRM_NALGO=m CONFIG_XFRM_USER=y CONFIG_NET_KEY=m CONFIG_INET=y @@ -375,7 +373,6 @@ 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_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -693,15 +690,12 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_MAC80211=m -CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS 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 @@ -920,7 +914,6 @@ CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_ISCSI_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # @@ -1003,7 +996,6 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1028,7 +1020,6 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1065,8 +1056,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -# CONFIG_DM_UEVENT is not set # # Fusion MPT device support @@ -1078,7 +1067,6 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m @@ -1216,15 +1204,12 @@ CONFIG_QLA3XXX=m # CONFIG_CHELSIO_T1=m # CONFIG_CHELSIO_T3 is not set -CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m -CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1288,11 +1273,9 @@ CONFIG_HOSTAP_CS=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWL4965=m -# CONFIG_IWL4965_QOS is not set -# CONFIG_IWL4965_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWL4965_SENSITIVITY is not set -# CONFIG_IWL4965_DEBUG is not set # CONFIG_IWL3945 is not set # @@ -1699,6 +1682,10 @@ CONFIG_MAX_RAW_DEVS=8192 # CONFIG_HPET is not set CONFIG_HANGCHECK_TIMER=m CONFIG_MMTIMER=y + +# +# TPM devices +# # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set @@ -2206,7 +2193,6 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -2337,6 +2323,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m + +# +# InfiniBand support +# # CONFIG_INFINIBAND is not set # @@ -2470,7 +2460,6 @@ CONFIG_CONFIGFS_FS=m # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -2689,16 +2678,7 @@ CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_API=m -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NHMAC=m -CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -2707,10 +2687,6 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -2726,7 +2702,6 @@ CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=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 852a070..2ffc74e 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 -# Fri Jun 27 01:43:25 2008 +# Sat Nov 24 07:58:17 2007 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -160,7 +160,6 @@ CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_SGI_SN=y -# CONFIG_IA64_HP_AML_NFW is not set # # SN Devices @@ -283,7 +282,6 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -CONFIG_XFRM_NALGO=m CONFIG_XFRM_USER=y CONFIG_NET_KEY=m CONFIG_INET=y @@ -368,7 +366,6 @@ 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_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -686,15 +683,12 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_MAC80211=m -CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS 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 @@ -913,7 +907,6 @@ CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_ISCSI_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # @@ -996,7 +989,6 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1021,7 +1013,6 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1058,8 +1049,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -# CONFIG_DM_UEVENT is not set # # Fusion MPT device support @@ -1071,7 +1060,6 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m @@ -1210,15 +1198,12 @@ CONFIG_QLA3XXX=m # CONFIG_CHELSIO_T1=m # CONFIG_CHELSIO_T3 is not set -CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m -CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1282,11 +1267,9 @@ CONFIG_HOSTAP_CS=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWL4965=m -# CONFIG_IWL4965_QOS is not set -# CONFIG_IWL4965_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWL4965_SENSITIVITY is not set -# CONFIG_IWL4965_DEBUG is not set # CONFIG_IWL3945 is not set # @@ -1696,6 +1679,10 @@ CONFIG_MAX_RAW_DEVS=8192 # CONFIG_HPET is not set CONFIG_HANGCHECK_TIMER=m CONFIG_MMTIMER=y + +# +# TPM devices +# # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set @@ -2203,7 +2190,6 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -2334,6 +2320,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m + +# +# InfiniBand support +# # CONFIG_INFINIBAND is not set # @@ -2467,7 +2457,6 @@ CONFIG_CONFIGFS_FS=m # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -2685,16 +2674,7 @@ CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_API=m -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NHMAC=m -CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -2703,10 +2683,6 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -2722,7 +2698,6 @@ CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=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 30fb307..c23f176 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 @@ -335,7 +335,6 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -CONFIG_XFRM_NALGO=m CONFIG_XFRM_USER=y CONFIG_NET_KEY=m CONFIG_INET=y @@ -420,7 +419,6 @@ 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_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -738,15 +736,12 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_MAC80211=m -CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS 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 @@ -1068,7 +1063,6 @@ CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_ISCSI_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # @@ -1154,7 +1148,6 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1179,7 +1172,6 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1216,8 +1208,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -# CONFIG_DM_UEVENT is not set # # Fusion MPT device support @@ -1229,7 +1219,6 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m @@ -1377,15 +1366,12 @@ CONFIG_QLA3XXX=m # CONFIG_CHELSIO_T1=m # CONFIG_CHELSIO_T3 is not set -CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m -CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1463,11 +1449,9 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWL4965=m -# CONFIG_IWL4965_QOS is not set -# CONFIG_IWL4965_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWL4965_SENSITIVITY is not set -# CONFIG_IWL4965_DEBUG is not set # CONFIG_IWL3945 is not set # @@ -1835,7 +1819,6 @@ CONFIG_IBMASR=m # CONFIG_WAFER_WDT is not set CONFIG_I6300ESB_WDT=m CONFIG_I8XX_TCO=m -CONFIG_HP_WATCHDOG=m # CONFIG_SC1200_WDT is not set # CONFIG_60XX_WDT is not set # CONFIG_SBC8360_WDT is not set @@ -1902,6 +1885,10 @@ CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m + +# +# TPM devices +# # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set @@ -2425,7 +2412,6 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -2557,6 +2543,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m + +# +# InfiniBand support +# # CONFIG_INFINIBAND is not set # @@ -2570,8 +2560,6 @@ CONFIG_EDAC=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I5000=m CONFIG_EDAC_K8=m CONFIG_EDAC_POLL=y @@ -2626,7 +2614,6 @@ CONFIG_INTEL_IOATDMA=m CONFIG_EDD=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set # # File systems @@ -2710,7 +2697,6 @@ CONFIG_CONFIGFS_FS=m # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -2870,7 +2856,6 @@ CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -2912,16 +2897,7 @@ CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_API=m -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NHMAC=m -CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -2930,10 +2906,6 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -2950,7 +2922,6 @@ CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=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 8fe5826..ba22c5e 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 @@ -314,7 +314,6 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -CONFIG_XFRM_NALGO=m CONFIG_XFRM_USER=y CONFIG_NET_KEY=m CONFIG_INET=y @@ -399,7 +398,6 @@ 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_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -717,15 +715,12 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_MAC80211=m -CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS 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 @@ -1047,7 +1042,6 @@ CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_ISCSI_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # @@ -1133,7 +1127,6 @@ CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -1158,7 +1151,6 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NS87410 is not set -CONFIG_PATA_NS87415=m # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PCMCIA is not set @@ -1195,8 +1187,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -# CONFIG_DM_UEVENT is not set # # Fusion MPT device support @@ -1208,7 +1198,6 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m @@ -1357,15 +1346,12 @@ CONFIG_QLA3XXX=m # CONFIG_CHELSIO_T1=m # CONFIG_CHELSIO_T3 is not set -CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m -CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1443,11 +1429,9 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWL4965=m -# CONFIG_IWL4965_QOS is not set -# CONFIG_IWL4965_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWL4965_SENSITIVITY is not set -# CONFIG_IWL4965_DEBUG is not set # CONFIG_IWL3945 is not set # @@ -1818,7 +1802,6 @@ CONFIG_IBMASR=m # CONFIG_WAFER_WDT is not set CONFIG_I6300ESB_WDT=m CONFIG_I8XX_TCO=m -CONFIG_HP_WATCHDOG=m # CONFIG_SC1200_WDT is not set # CONFIG_60XX_WDT is not set # CONFIG_SBC8360_WDT is not set @@ -1886,6 +1869,10 @@ CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m + +# +# TPM devices +# # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set @@ -2409,7 +2396,6 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -2541,6 +2527,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m + +# +# InfiniBand support +# # CONFIG_INFINIBAND is not set # @@ -2554,8 +2544,6 @@ CONFIG_EDAC=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I5000=m CONFIG_EDAC_K8=m CONFIG_EDAC_POLL=y @@ -2610,7 +2598,6 @@ CONFIG_INTEL_IOATDMA=m CONFIG_EDD=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -# CONFIG_ISCSI_IBFT_FIND is not set # # File systems @@ -2694,7 +2681,6 @@ CONFIG_CONFIGFS_FS=m # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -2854,7 +2840,6 @@ CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -2896,16 +2881,7 @@ CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_API=m -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NHMAC=m -CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -2914,10 +2890,6 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -2934,7 +2906,6 @@ CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y -- 1.8.3.1