From 87657f1f6a7ddf753977fd686b67ee80693e16fb Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Fri, 8 Jan 2010 12:47:51 +0100 Subject: [PATCH] b=20400 revert patch since BoM needs older RHEL5 kernel --- lustre/ChangeLog | 9 +++++++++ lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch | 2 +- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 244ae66..10996f9 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,5 +1,7 @@ 2010-01-08 Sun Microsystems, Inc. * version 1.8.1.1-BOM + * Support for kernel: + 2.6.18-128.1.14.el5 (RHEL 5) Severity : major Bugzilla : 20892 @@ -42,6 +44,13 @@ Description: LSI Fusion MPT driver hacks to improve performance on Thor and Riverwalk Details : bump CONFIG_FUSION_MAX_SGE to 256 for rhel5 +Severity : normal +Bugzilla : 20400 +Description: Downgrade RHEL5 kernel to 2.6.18-128.1.14.el5 +Details : BoM needs 2.6.18-128.1.14.el5, so revert the patch from bug 20400 + +------------------------------------------------------------------------------- + 2009-10-16 Sun Microsystems, Inc. * version 1.8.1.1 * Support for kernels: diff --git a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch index deb8b60..e66bf54 100644 --- a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch +++ b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch @@ -382,9 +382,9 @@ Index: linux-2.6.18-128.1.14/include/linux/page-flags.h --- linux-2.6.18-128.1.14.orig/include/linux/page-flags.h 2009-06-19 12:33:11.000000000 -0600 +++ linux-2.6.18-128.1.14/include/linux/page-flags.h 2009-06-19 12:34:50.000000000 -0600 @@ -87,6 +87,7 @@ - #define PG_reclaim 17 /* To be reclaimed asap */ #define PG_nosave_free 18 /* Free, should not be written */ #define PG_buddy 19 /* Page is free, on buddy lists */ + #define PG_gup 20 /* Page pin may be because of gup */ +#define PG_constant 21 /* To mark if the page is constant */ #define PG_xpmem 27 /* Testing for xpmem. */ diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index a21e014..66c7a3a 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.18" -lnxrel="128.7.1.el5" +lnxrel="128.1.14.el5" KERNEL_SRPM=kernel-$lnxmaj-$lnxrel.src.rpm SERIES=2.6-rhel5.series -- 1.8.3.1