From 82dff34569766e08218c395c04f428530ff7726e Mon Sep 17 00:00:00 2001 From: yangsheng Date: Wed, 29 Jul 2009 07:38:32 +0000 Subject: [PATCH 1/1] Branch HEAD b=19846 i=shadow, johann Update kernel to RHEL5.3 2.6.18-128.1.14.el5. --- lustre/ChangeLog | 6 +++++- lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch | 3 ++- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 38ec1a2..86b3936 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,7 +2,7 @@ tbd Sun Microsystems, Inc. * version 2.0.0 * Support for kernels: 2.6.16.60-0.39.3 (SLES 10), - 2.6.18-128.1.6.el5 (RHEL 5), + 2.6.18-128.1.14.el5 (RHEL 5), 2.6.22.14 vanilla (kernel.org). * Client support for unpatched kernels: (see http://wiki.lustre.org/index.php?title=Patchless_Client) @@ -39,6 +39,10 @@ Details : Use new OBD_BRW_MEMALLOC flag to notify OST about writes in the so that the OST threads generate memory pressure and allow inactive pages to be reclaimed. +Severity : enhancement +Bugzilla : 19846 +Description: Update kernel to RHEL5.3 2.6.18-128.1.14.el5. + Severity : normal Frequency : rare Bugzilla : 18380 diff --git a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch index ccfb87b..1ba727c 100644 --- a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch +++ b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch @@ -385,7 +385,8 @@ Index: linux-2.6.18-128.1.6/include/linux/page-flags.h #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_constant 20 /* To mark if the page is constant */ + #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. */ /* PG_owner_priv_1 users should have descriptive aliases */ diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index 7724a57..ab9e7d7 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.1.6.el5" +lnxrel="128.1.14.el5" KERNEL_SRPM=kernel-$lnxmaj-$lnxrel.src.rpm SERIES=2.6-rhel5.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index d8af14f..e20c1d0 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -3,7 +3,7 @@ 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.1.6.el5 +2.6-rhel5 RHEL5: 2.6.18-128.1.14.el5 2.6.18-vanilla kernel.org: 2.6.18.8 2.6.22-vanilla kernel.org: 2.6.22.14 -- 1.8.3.1