From: yangsheng Date: Thu, 20 Aug 2009 13:07:44 +0000 (+0000) Subject: Branch b1_8 X-Git-Tag: v1_8_2_01~1^2~166 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6f33d422a68ce614f871b29348377133b8da27d0;p=fs%2Flustre-release.git Branch b1_8 b=16504 i=shadow, green, brian, cliff Update kernel for RHEL4.7 2.6.9-78.0.24.EL. --- diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config index 00c421f..447b118 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.9-prep.qp3.5.34.4qsnet -# Sat Nov 24 21:29:36 2007 +# Thu Jun 11 17:46:15 2009 # CONFIG_X86=y CONFIG_MMU=y @@ -24,6 +24,7 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASK_IO_ACCOUNTING is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -112,6 +113,7 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y # CONFIG_X86_HIGH_ENTRY is not set CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y +CONFIG_TICK_DIVIDER=y CONFIG_SMP=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y @@ -615,6 +617,7 @@ CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA25XX=m CONFIG_SCSI_QLA4XXX=m # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set @@ -681,6 +684,7 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m +CONFIG_DM_MULTIPATH_HP=m # # Fusion MPT device support @@ -767,6 +771,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m +CONFIG_INET_LRO=m # # IP: Virtual Server Configuration @@ -1154,12 +1159,15 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y # CONFIG_CHELSIO_T3 is not set CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_BNX2X=m +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1925,7 +1933,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AZT3328=m -CONFIG_SND_AZX=m CONFIG_SND_BT87X=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y @@ -1937,6 +1944,7 @@ CONFIG_SND_NM256=m CONFIG_SND_RME32=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m +CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_TRIDENT=m CONFIG_SND_YMFPCI=m @@ -2184,6 +2192,8 @@ 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 @@ -2305,8 +2315,11 @@ CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -2449,6 +2462,13 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m + +# +# Xen PV-ON-HVM Configuration +# +CONFIG_XEN_PV_ON_HVM=y # # Library routines diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config index 6a51a21..de59b1b 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.9-prep.qp3.5.34.4qsnet -# Sat Nov 24 21:30:07 2007 +# Thu Jun 11 17:49:39 2009 # CONFIG_X86=y CONFIG_MMU=y @@ -25,6 +25,7 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASK_IO_ACCOUNTING is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -110,6 +111,7 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y # CONFIG_X86_HIGH_ENTRY is not set CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y +CONFIG_TICK_DIVIDER=y # CONFIG_SMP is not set # CONFIG_PREEMPT is not set CONFIG_PREEMPT_VOLUNTARY=y @@ -130,9 +132,10 @@ CONFIG_EDD=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m # CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -601,6 +604,7 @@ CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA25XX=m CONFIG_SCSI_QLA4XXX=m # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set @@ -667,6 +671,7 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m +CONFIG_DM_MULTIPATH_HP=m # # Fusion MPT device support @@ -753,6 +758,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m +CONFIG_INET_LRO=m # # IP: Virtual Server Configuration @@ -1142,12 +1148,15 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y # CONFIG_CHELSIO_T3 is not set CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_BNX2X=m +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1305,7 +1314,7 @@ CONFIG_ISDN_TTY_FAX=y # # ISDN feature submodules # -CONFIG_ISDN_DRV_LOOP=m +# CONFIG_ISDN_DRV_LOOP is not set # # ISDN4Linux hardware drivers @@ -1385,8 +1394,7 @@ CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m CONFIG_ISDN_DRV_ACT2000=m CONFIG_ISDN_DRV_TPAM=m -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y +# CONFIG_HYSDN is not set # # CAPI subsystem @@ -1773,7 +1781,6 @@ CONFIG_VIDEO_BT848=m # CONFIG_TUNER_3036 is not set # CONFIG_VIDEO_STRADIS is not set # CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_MEYE is not set # CONFIG_VIDEO_SAA7134 is not set # CONFIG_VIDEO_MXB is not set # CONFIG_VIDEO_DPC is not set @@ -1932,7 +1939,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AZT3328=m -CONFIG_SND_AZX=m CONFIG_SND_BT87X=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y @@ -1944,6 +1950,7 @@ CONFIG_SND_NM256=m CONFIG_SND_RME32=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m +CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_TRIDENT=m CONFIG_SND_YMFPCI=m @@ -2113,7 +2120,7 @@ CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m @@ -2192,6 +2199,8 @@ 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 @@ -2313,8 +2322,11 @@ CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -2455,6 +2467,13 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m + +# +# Xen PV-ON-HVM Configuration +# +CONFIG_XEN_PV_ON_HVM=y # # Library routines diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config index 525a396..1677b6a 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.9-prep.qp3.5.34.4qsnet -# Sat Nov 24 21:28:15 2007 +# Thu Jun 11 17:36:26 2009 # # @@ -19,6 +19,7 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASK_IO_ACCOUNTING is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -374,6 +375,7 @@ CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA25XX=m CONFIG_SCSI_QLA4XXX=m # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set @@ -428,6 +430,7 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m +CONFIG_DM_MULTIPATH_HP=m # # Fusion MPT device support @@ -510,6 +513,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m +CONFIG_INET_LRO=m # # IP: Virtual Server Configuration @@ -871,12 +875,15 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y # CONFIG_CHELSIO_T3 is not set CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_BNX2X=m +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1308,6 +1315,7 @@ CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_PIIX4=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m # CONFIG_SCx200_ACB is not set @@ -1511,7 +1519,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AZT3328=m -CONFIG_SND_AZX=m CONFIG_SND_BT87X=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y @@ -1523,6 +1530,7 @@ CONFIG_SND_NM256=m CONFIG_SND_RME32=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m +CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_TRIDENT=m CONFIG_SND_YMFPCI=m @@ -1866,8 +1874,11 @@ CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config index bfa15ba..173a800 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.9-prep.qp3.5.34.4qsnet -# Sat Nov 24 21:28:54 2007 +# Thu Jun 11 17:45:47 2009 # # @@ -9,6 +9,7 @@ # CONFIG_EXPERIMENTAL=y CONFIG_CLEAN_COMPILE=y +CONFIG_BROKEN_ON_SMP=y # # General setup @@ -19,6 +20,7 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASK_IO_ACCOUNTING is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -51,7 +53,6 @@ CONFIG_MODVERSIONS=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set CONFIG_KMOD=y -CONFIG_STOP_MACHINE=y # # Processor type and features @@ -82,12 +83,8 @@ CONFIG_IA64_CYCLONE=y CONFIG_IOSAPIC=y CONFIG_IA64_LOCAL_APIC_INFO_MOD=m CONFIG_FORCE_MAX_ZONEORDER=18 -CONFIG_SMP=y -CONFIG_NR_CPUS=64 -# CONFIG_HOTPLUG_CPU is not set -CONFIG_SCHED_SMT=y +# CONFIG_SMP is not set # CONFIG_PREEMPT is not set -CONFIG_HAVE_DEC_LOCK=y # CONFIG_IA32_SUPPORT is not set CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y @@ -374,6 +371,7 @@ CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA25XX=m CONFIG_SCSI_QLA4XXX=m # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set @@ -428,6 +426,7 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m +CONFIG_DM_MULTIPATH_HP=m # # Fusion MPT device support @@ -510,6 +509,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m +CONFIG_INET_LRO=m # # IP: Virtual Server Configuration @@ -816,6 +816,7 @@ CONFIG_DE4X5=m CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_PCMCIA_XIRCOM=m +# CONFIG_PCMCIA_XIRTULIP is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m @@ -871,12 +872,15 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y # CONFIG_CHELSIO_T3 is not set CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_BNX2X=m +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1012,6 +1016,7 @@ CONFIG_ISDN_TTY_FAX=y # # ISDN feature submodules # +# CONFIG_ISDN_DRV_LOOP is not set # # ISDN4Linux hardware drivers @@ -1077,6 +1082,7 @@ CONFIG_HISAX_HDLC=y # Active cards # CONFIG_ISDN_DRV_TPAM=m +# CONFIG_HYSDN is not set # # CAPI subsystem @@ -1180,12 +1186,24 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set # CONFIG_ROCKETPORT is not set # CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_DIGI is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set # CONFIG_SYNCLINK is not set # CONFIG_SYNCLINKMP is not set CONFIG_N_HDLC=m +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set CONFIG_STALDRV=y +# CONFIG_STALLION is not set +# CONFIG_ISTALLION is not set CONFIG_SGI_SNSC=y CONFIG_SGI_TIOCX=y # CONFIG_SGI_MBCS is not set @@ -1308,6 +1326,7 @@ CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_PIIX4=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m # CONFIG_SCx200_ACB is not set @@ -1360,7 +1379,7 @@ CONFIG_SENSORS_RTC8564=m # # Hardware Monitoring support # -CONFIG_HWMON=y +CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_LM87=m @@ -1511,7 +1530,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AZT3328=m -CONFIG_SND_AZX=m CONFIG_SND_BT87X=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y @@ -1523,6 +1541,7 @@ CONFIG_SND_NM256=m CONFIG_SND_RME32=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m +CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_TRIDENT=m CONFIG_SND_YMFPCI=m @@ -1689,6 +1708,7 @@ CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_BELKIN=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m @@ -1866,8 +1886,11 @@ CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config index 47daf08..f257617 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.9-prep.qp3.5.34.4qsnet -# Sat Nov 24 21:26:14 2007 +# Thu Jun 11 17:34:35 2009 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -13,6 +13,7 @@ CONFIG_EARLY_PRINTK=y CONFIG_HPET_TIMER=y CONFIG_X86_PM_TIMER=y CONFIG_HPET_EMULATE_RTC=y +CONFIG_TICK_DIVIDER=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y @@ -31,6 +32,7 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASK_IO_ACCOUNTING is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -507,6 +509,7 @@ CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA25XX=m CONFIG_SCSI_QLA4XXX=m # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set @@ -561,6 +564,7 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m +CONFIG_DM_MULTIPATH_HP=m # # Fusion MPT device support @@ -647,6 +651,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m +CONFIG_INET_LRO=m # # IP: Virtual Server Configuration @@ -1008,12 +1013,15 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y # CONFIG_CHELSIO_T3 is not set CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_BNX2X=m +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1472,6 +1480,7 @@ CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_PIIX4=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m # CONFIG_SCx200_ACB is not set @@ -1682,7 +1691,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AZT3328=m -CONFIG_SND_AZX=m CONFIG_SND_BT87X=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y @@ -1694,6 +1702,7 @@ CONFIG_SND_NM256=m CONFIG_SND_RME32=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m +CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_TRIDENT=m CONFIG_SND_YMFPCI=m @@ -1938,6 +1947,8 @@ 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 @@ -2066,8 +2077,11 @@ CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -2202,6 +2216,13 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m + +# +# Xen PV-ON-HVM Configuration +# +CONFIG_XEN_PV_ON_HVM=y # # Library routines diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config index 7808716..b11435f 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.9-prep.qp3.5.34.4qsnet -# Sat Nov 24 21:27:28 2007 +# Thu Jun 11 17:35:02 2009 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -13,6 +13,7 @@ CONFIG_EARLY_PRINTK=y CONFIG_HPET_TIMER=y CONFIG_X86_PM_TIMER=y CONFIG_HPET_EMULATE_RTC=y +CONFIG_TICK_DIVIDER=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y @@ -21,6 +22,7 @@ CONFIG_GENERIC_IOMAP=y # CONFIG_EXPERIMENTAL=y CONFIG_CLEAN_COMPILE=y +CONFIG_BROKEN_ON_SMP=y # # General setup @@ -31,6 +33,7 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASK_IO_ACCOUNTING is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -63,7 +66,6 @@ CONFIG_MODVERSIONS=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set CONFIG_KMOD=y -CONFIG_STOP_MACHINE=y # # Processor type and features @@ -80,19 +82,12 @@ CONFIG_X86_GOOD_APIC=y CONFIG_MICROCODE=m CONFIG_X86_MSR=y CONFIG_X86_CPUID=y -CONFIG_X86_HT=y CONFIG_X86_IO_APIC=y CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_LOCAL_APIC_INFO_MOD=m CONFIG_MTRR=y -CONFIG_SMP=y +# CONFIG_SMP is not set # CONFIG_PREEMPT is not set -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -CONFIG_K8_NUMA=y -CONFIG_DISCONTIGMEM=y -CONFIG_NUMA=y -CONFIG_HAVE_DEC_LOCK=y -CONFIG_NR_CPUS=32 CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_X86_MCE=y @@ -121,7 +116,6 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_FAN=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_NUMA=y CONFIG_ACPI_ASUS=m CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=2001 @@ -162,7 +156,6 @@ CONFIG_PCI=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y # CONFIG_UNORDERED_IO is not set -# CONFIG_HOTPLUG_CPU is not set CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY_PROC=y # CONFIG_PCI_NAMES is not set @@ -507,6 +500,7 @@ CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA25XX=m CONFIG_SCSI_QLA4XXX=m # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set @@ -561,6 +555,7 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m +CONFIG_DM_MULTIPATH_HP=m # # Fusion MPT device support @@ -647,6 +642,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m +CONFIG_INET_LRO=m # # IP: Virtual Server Configuration @@ -953,6 +949,7 @@ CONFIG_DE4X5=m CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_PCMCIA_XIRCOM=m +# CONFIG_PCMCIA_XIRTULIP is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m @@ -1008,12 +1005,15 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y # CONFIG_CHELSIO_T3 is not set CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_BNX2X=m +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -1158,6 +1158,7 @@ CONFIG_ISDN_TTY_FAX=y # # ISDN feature submodules # +# CONFIG_ISDN_DRV_LOOP is not set # # ISDN4Linux hardware drivers @@ -1223,6 +1224,7 @@ CONFIG_HISAX_HDLC=y # Active cards # CONFIG_ISDN_DRV_TPAM=m +# CONFIG_HYSDN is not set # # CAPI subsystem @@ -1327,12 +1329,24 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set # CONFIG_ROCKETPORT is not set # CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_DIGI is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set # CONFIG_SYNCLINK is not set # CONFIG_SYNCLINKMP is not set CONFIG_N_HDLC=m +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set CONFIG_STALDRV=y +# CONFIG_STALLION is not set +# CONFIG_ISTALLION is not set # # Serial drivers @@ -1421,6 +1435,7 @@ CONFIG_DTLK=m # # Ftape, the floppy tape device driver # +# CONFIG_FTAPE is not set CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=y @@ -1472,6 +1487,7 @@ CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_PIIX4=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m # CONFIG_SCx200_ACB is not set @@ -1682,7 +1698,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AZT3328=m -CONFIG_SND_AZX=m CONFIG_SND_BT87X=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y @@ -1694,6 +1709,7 @@ CONFIG_SND_NM256=m CONFIG_SND_RME32=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m +CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_TRIDENT=m CONFIG_SND_YMFPCI=m @@ -1860,6 +1876,7 @@ CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_BELKIN=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m @@ -1938,6 +1955,8 @@ 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 @@ -2066,8 +2085,11 @@ CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -2151,6 +2173,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_SPINLOCK_SLEEP=y CONFIG_DEBUG_INFO=y +# CONFIG_CHECKING is not set CONFIG_INIT_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_IOMMU_DEBUG is not set @@ -2202,6 +2225,13 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m + +# +# Xen PV-ON-HVM Configuration +# +CONFIG_XEN_PV_ON_HVM=y # # Library routines diff --git a/lustre/kernel_patches/patches/remove-suid-2.6-suse.patch b/lustre/kernel_patches/patches/remove-suid-2.6-suse.patch index 4a4e10f..495f228 100644 --- a/lustre/kernel_patches/patches/remove-suid-2.6-suse.patch +++ b/lustre/kernel_patches/patches/remove-suid-2.6-suse.patch @@ -1,22 +1,24 @@ --- linux-2.6.5-7.141/mm/filemap.c.orig 2005-02-18 14:53:26.000000000 +0200 +++ linux-2.6.5-7.141/mm/filemap.c 2005-02-18 22:37:28.727492096 +0200 -@@ -1816,6 +1816,19 @@ int remove_suid(struct dentry *dentry) - - if (unlikely(kill && !capable(CAP_FSETID))) { - struct iattr newattrs; -+ struct inode_operations *op = dentry->d_inode->i_op; +@@ -1816,6 +1816,21 @@ + int __remove_suid(struct dentry *dentry, int kill) + { + struct iattr newattrs; ++ struct inode_operations *op = dentry->d_inode->i_op; + -+ if (op && op->setattr_raw) { -+ newattrs.ia_mode = mode & ~S_ISUID; -+ if (kill & ATTR_KILL_SGID) -+ newattrs.ia_mode &= ~S_ISGID; ++ if (op && op->setattr_raw) { ++ int result; ++ mode_t mode = dentry->d_inode->i_mode; ++ newattrs.ia_mode = mode & ~S_ISUID; ++ if (kill & ATTR_KILL_SGID) ++ newattrs.ia_mode &= ~S_ISGID; + -+ newattrs.ia_valid = ATTR_FORCE | ATTR_MODE; -+ result = op->setattr_raw(dentry->d_inode, &newattrs); -+ /* the file system wants to use normal vfs path now */ -+ if (result != -EOPNOTSUPP) -+ return result; -+ } ++ newattrs.ia_valid = ATTR_FORCE | ATTR_MODE; ++ result = op->setattr_raw(dentry->d_inode, &newattrs); ++ /* the file system wants to use normal vfs path now */ ++ if (result != -EOPNOTSUPP) ++ return result; ++ } - newattrs.ia_valid = ATTR_FORCE | kill; - result = notify_change(dentry, &newattrs); + newattrs.ia_valid = ATTR_FORCE | kill; + return notify_change(dentry, &newattrs); diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch b/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch index 66e65fb..7d61e8f 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch @@ -51,13 +51,17 @@ diff -rup RH_2_6_9_55.orig/fs/exec.c RH_2_6_9_55/fs/exec.c file = ERR_PTR(err); if (!err) { -@@ -501,7 +503,7 @@ struct file *open_exec(const char *name) +@@ -501,9 +503,10 @@ struct file *open_exec(const char *name) int err = permission(inode, MAY_EXEC, &nd); file = ERR_PTR(err); if (!err) { -- file = dentry_open(nd.dentry, nd.mnt, O_RDONLY); -+ file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent); - if (!IS_ERR(file)) { +- file = dentry_open(nd.dentry, nd.mnt, ++ file = dentry_open_it(nd.dentry, nd.mnt, + force_o_largefile() ? +- O_RDONLY|O_LARGEFILE : O_RDONLY); ++ O_RDONLY|O_LARGEFILE : O_RDONLY, ++ &nd.intent); + if (!IS_ERR(file)) { err = deny_write_access(file); if (err) { diff -rup RH_2_6_9_55.orig/fs/inode.c RH_2_6_9_55/fs/inode.c diff --git a/lustre/kernel_patches/series/2.6-rhel4.series b/lustre/kernel_patches/series/2.6-rhel4.series index 6f7c5dd..f928a48 100644 --- a/lustre/kernel_patches/series/2.6-rhel4.series +++ b/lustre/kernel_patches/series/2.6-rhel4.series @@ -1,42 +1,12 @@ lustre_version.patch vfs_intent-2.6-rhel4.patch vfs_races-2.6-rhel4.patch -iopen-misc-2.6-suse.patch -export_symbols-2.6-rhel4.patch dev_read_only-2.6-suse.patch -export-log-2.6-rhel4.patch lookup_bdev_init_intent.patch remove-suid-2.6-suse.patch export-show_task-2.6-vanilla.patch -sd_iostats-2.6-rhel4.patch -blkdev_tunables-2.6-suse.patch -fsprivate-2.6.patch -export_symbol_numa.patch qsnet-rhel4-2.6.patch -linux-2.6-binutils-2.16.patch vm-tunables-rhel4.patch tcp-rto_proc-2.6.9.patch -rollback-raid5ch-to-55.patch -raid5-stats.patch -raid5-configurable-cachesize.patch -raid5-large-io.patch -raid5-stripe-by-stripe-handling.patch -raid5-merge-ios.patch -raid5-serialize-ovelapping-reqs.patch -raid5-zerocopy.patch -raid6-stats.patch -raid6-configurable-cachesize.patch -raid6-large-io.patch -raid6-stripe-by-stripe-handling.patch -raid6-merge-ios.patch -raid6-serialize-ovelapping-reqs.patch -raid6-zerocopy.patch -jbd-stats-2.6.9.patch -bitops_ext2_find_next_le_bit-2.6.patch -quota-deadlock-on-pagelock-core.patch -quota-umount-race-fix.patch -quota-deadlock-on-pagelock-ext3.patch vfs-keep-inode-hashed-for-clear-inode.patch modpost_external_module_updates_rhel4.patch -mpt-fusion-downgrade-to-3_02_73-rhel4.patch -md-mmp-unplug-dev-sles10.patch diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in index 187cdea..71d7537 100644 --- a/lustre/kernel_patches/targets/2.6-rhel4.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.9" -lnxrel="67.0.22.EL" +lnxrel="78.0.24.EL" KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2 SERIES=2.6-rhel4.series