From 083ba869b7ae7d4b046665e5c06fbc42089d6948 Mon Sep 17 00:00:00 2001
From: phil <phil>
Date: Sat, 12 Feb 2005 20:53:59 +0000
Subject: [PATCH] Updated config files from 2.4.21-37EL, which enable a handful
 of new modules (at least on x86_64)

---
 .../kernel-2.4.21-rhel-2.4-i686-smp.config         |  6 +--
 .../kernel-2.4.21-rhel-2.4-i686.config             | 48 +++++++++++-----------
 .../kernel-2.4.21-rhel-2.4-x86_64-smp.config       | 20 +++++----
 .../kernel-2.4.21-rhel-2.4-x86_64.config           | 31 +++++++-------
 4 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config
index 18009b1..3781659 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config
@@ -1624,9 +1624,9 @@ CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_RW is not set
 CONFIG_ROMFS_FS=m
 CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_XATTR_SHARING=y
-CONFIG_EXT2_FS_XATTR_USER=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XATTR_SHARING is not set
+# CONFIG_EXT2_FS_XATTR_USER is not set
 CONFIG_SYSV_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_RW=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
index 18009b1..fce798b 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
@@ -49,7 +49,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_HAS_TSC=y
 CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_PGE=y
+# CONFIG_X86_PGE is not set
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_PPRO_FENCE=y
 CONFIG_X86_F00F_WORKS_OK=y
@@ -58,7 +58,14 @@ CONFIG_X86_MCE=y
 #
 # CPU Frequency scaling
 #
-# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_24_API is not set
+CONFIG_X86_POWERNOW_K6=m
+# CONFIG_X86_LONGHAUL is not set
+CONFIG_X86_SPEEDSTEP=m
+# CONFIG_X86_P4_CLOCKMOD is not set
+# CONFIG_X86_LONGRUN is not set
+# CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
@@ -67,11 +74,10 @@ CONFIG_X86_CPUID=m
 # CONFIG_E820_PROC is not set
 CONFIG_EDD=m
 # CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
+#CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
-CONFIG_X86_PAE=y
 CONFIG_HIGHIO=y
 # CONFIG_X86_4G is not set
 CONFIG_3GB=y
@@ -79,29 +85,21 @@ CONFIG_3GB=y
 # CONFIG_1GB is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
-CONFIG_SMP=y
-# CONFIG_NR_SIBLINGS_0 is not set
-CONFIG_NR_SIBLINGS_2=y
-CONFIG_SHARE_RUNQUEUE=y
-CONFIG_MAX_NR_SIBLINGS=2
-CONFIG_X86_CLUSTERED_APIC=y
-CONFIG_X86_NUMA=y
-# CONFIG_X86_NUMAQ is not set
-CONFIG_X86_SUMMIT=y
-CONFIG_X86_CLUSTERED_APIC=y
+# CONFIG_SMP is not set
+# CONFIG_X86_UP_APIC is not set
+# CONFIG_X86_UP_IOAPIC is not set
+# CONFIG_X86_TSC_DISABLE is not set
+CONFIG_X86_TSC=y
 # CONFIG_NOBIGSTACK is not set
 CONFIG_STACK_SIZE_16KB=y
 # CONFIG_STACK_SIZE_32KB is not set
 # CONFIG_STACK_SIZE_64KB is not set
 CONFIG_STACK_SIZE_SHIFT=2
-CONFIG_HAVE_DEC_LOCK=y
 
 #
 # General setup
 #
 CONFIG_NET=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_LOCAL_APIC=y
 CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
@@ -127,10 +125,10 @@ CONFIG_I82365=y
 #
 # PCI Hotplug Support
 #
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
+# CONFIG_HOTPLUG_PCI_IBM is not set
 # CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
@@ -801,7 +799,7 @@ CONFIG_DEPCA=m
 CONFIG_HP100=m
 CONFIG_NET_ISA=y
 CONFIG_E2100=m
-# CONFIG_EWRK3 is not set
+CONFIG_EWRK3=m
 CONFIG_EEXPRESS=m
 CONFIG_EEXPRESS_PRO=m
 CONFIG_HPLAN_PLUS=m
@@ -830,7 +828,7 @@ CONFIG_LNE390=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
-CONFIG_FORCEDETH=m
+# CONFIG_FORCEDETH is not set
 CONFIG_NE3210=m
 CONFIG_ES3210=m
 CONFIG_8139CP=m
@@ -1624,9 +1622,9 @@ CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_RW is not set
 CONFIG_ROMFS_FS=m
 CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_XATTR_SHARING=y
-CONFIG_EXT2_FS_XATTR_USER=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XATTR_SHARING is not set
+# CONFIG_EXT2_FS_XATTR_USER is not set
 CONFIG_SYSV_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_RW=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config
index e7ea628..5be9ee4 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config
@@ -188,7 +188,7 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_STATS=y
-# CONFIG_DISKDUMP is not set
+CONFIG_DISKDUMP=m
 
 #
 # Multi-device support (RAID and LVM)
@@ -523,6 +523,7 @@ CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_SD_EXTRA_DEVS=256
 CONFIG_SD_IOSTATS=y
+CONFIG_SCSI_DUMP=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
@@ -574,14 +575,14 @@ CONFIG_AIC7XXX_OLD_PROC_STATS=y
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
 CONFIG_SCSI_SATA_NV=m
-# CONFIG_SCSI_SATA_PROMISE is not set
+CONFIG_SCSI_SATA_PROMISE=m
 CONFIG_SCSI_SATA_SX4=m
-# CONFIG_SCSI_SATA_SIL is not set
+CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_CPQFCTS is not set
@@ -739,6 +740,7 @@ CONFIG_E100=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
+CONFIG_FORCEDETH=m
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
 CONFIG_8139CP=m
@@ -1291,9 +1293,9 @@ CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_RW is not set
 CONFIG_ROMFS_FS=m
 CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_XATTR_SHARING=y
-CONFIG_EXT2_FS_XATTR_USER=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XATTR_SHARING is not set
+# CONFIG_EXT2_FS_XATTR_USER is not set
 CONFIG_SYSV_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_RW=y
@@ -1543,6 +1545,8 @@ CONFIG_SOUND_YMFPCI_LEGACY=y
 # CONFIG_SOUND_UART6850 is not set
 # CONFIG_SOUND_AEDSP16 is not set
 # CONFIG_SOUND_TVMIXER is not set
+# CONFIG_SOUND_AD1980 is not set
+# CONFIG_SOUND_WM97XX is not set
 
 #
 # USB support
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
index e7ea628..a32b0ba 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
@@ -42,17 +42,13 @@ CONFIG_X86_CPUID=m
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_MTRR=y
-CONFIG_SMP=y
+# CONFIG_SMP is not set
 CONFIG_HPET_TIMER=y
 CONFIG_GART_IOMMU=y
 # CONFIG_SWIOTLB is not set
-CONFIG_NR_SIBLINGS_0=y
-# CONFIG_NR_SIBLINGS_2 is not set
-CONFIG_HAVE_DEC_LOCK=y
+CONFIG_X86_UP_IOAPIC=y
 CONFIG_MCE=y
-CONFIG_K8_NUMA=y
-CONFIG_DISCONTIGMEM=y
-CONFIG_NUMA=y
+# CONFIG_K8_NUMA is not set
 # CONFIG_NOBIGSTACK is not set
 CONFIG_STACK_SIZE_16KB=y
 # CONFIG_STACK_SIZE_32KB is not set
@@ -112,7 +108,6 @@ CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_NUMA is not set
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_DEBUG is not set
@@ -188,7 +183,7 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_STATS=y
-# CONFIG_DISKDUMP is not set
+CONFIG_DISKDUMP=m
 
 #
 # Multi-device support (RAID and LVM)
@@ -523,6 +518,7 @@ CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_SD_EXTRA_DEVS=256
 CONFIG_SD_IOSTATS=y
+CONFIG_SCSI_DUMP=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
@@ -574,14 +570,14 @@ CONFIG_AIC7XXX_OLD_PROC_STATS=y
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
 CONFIG_SCSI_SATA_NV=m
-# CONFIG_SCSI_SATA_PROMISE is not set
+CONFIG_SCSI_SATA_PROMISE=m
 CONFIG_SCSI_SATA_SX4=m
-# CONFIG_SCSI_SATA_SIL is not set
+CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_CPQFCTS is not set
@@ -739,6 +735,7 @@ CONFIG_E100=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
+CONFIG_FORCEDETH=m
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
 CONFIG_8139CP=m
@@ -1291,9 +1288,9 @@ CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_RW is not set
 CONFIG_ROMFS_FS=m
 CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_XATTR_SHARING=y
-CONFIG_EXT2_FS_XATTR_USER=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XATTR_SHARING is not set
+# CONFIG_EXT2_FS_XATTR_USER is not set
 CONFIG_SYSV_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_RW=y
@@ -1543,6 +1540,8 @@ CONFIG_SOUND_YMFPCI_LEGACY=y
 # CONFIG_SOUND_UART6850 is not set
 # CONFIG_SOUND_AEDSP16 is not set
 # CONFIG_SOUND_TVMIXER is not set
+# CONFIG_SOUND_AD1980 is not set
+# CONFIG_SOUND_WM97XX is not set
 
 #
 # USB support
-- 
1.8.3.1