Skip to content
Snippets Groups Projects
Commit 5206beba authored by Yang Sheng's avatar Yang Sheng
Browse files

Branch HEAD

b=17201

i=shadow, bobijam

Update to RHEL5 kernel-2.6.18-92.1.17.el5.
parent 479c0ec1
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@ tbd Sun Microsystems, Inc.
* version 2.0.0
* Support for kernels:
2.6.16.60-0.31 (SLES 10),
2.6.18-92.1.10.el5 (RHEL 5),
2.6.18-92.1.17.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)
......@@ -25,6 +25,10 @@ Severity : enhancement
Bugzilla : 11826
Description: Interoperability at server side (Disk interoperability)
Severity : enhancement
Bugzilla : 17201
Description: Update to RHEL5 kernel-2.6.18-92.1.17.el5.
Severity : enhancement
Bugzilla : 17458
Description: Update to SLES10 SP2 kernel-2.6.16.60-0.31.
......
......@@ -33,15 +33,16 @@ diff -pur linux-2.6.18-53.orig/drivers/md/md.c linux-2.6.18-53/drivers/md/md.c
{ .ctl_name = 0 }
};
@@ -4980,14 +4998,15 @@ static int is_mddev_idle(mddev_t *mddev)
@@ -4980,15 +4998,16 @@ static int is_mddev_idle(mddev_t *mddev)
{
mdk_rdev_t * rdev;
struct list_head *tmp;
int idle;
- unsigned long curr_events;
+ unsigned long rw, sync;
idle = 1;
ITERATE_RDEV(mddev,rdev,tmp) {
rcu_read_lock();
rdev_for_each_rcu(rdev, mddev) {
struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
- curr_events = disk_stat_read(disk, sectors[0]) +
- disk_stat_read(disk, sectors[1]) -
......
......@@ -345,9 +345,9 @@ diff -pur linux-2.6.18-53.orig/include/linux/page-flags.h linux-2.6.18-53/includ
#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_xpmem 27 /* Testing for xpmem. */
/* PG_owner_priv_1 users should have descriptive aliases */
#define PG_checked PG_owner_priv_1 /* Used by some filesystems */
@@ -252,6 +253,14 @@
struct page; /* forward declaration */
......
lnxmaj="2.6.18"
lnxrel="92.1.10.el5"
lnxrel="92.1.17.el5"
KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
SERIES=2.6-rhel5.series
......
......@@ -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.31
2.6-rhel5 RHEL5: 2.6.18-92.1.10.el5
2.6-rhel5 RHEL5: 2.6.18-92.1.17.el5
2.6.18-vanilla kernel.org: 2.6.18.8
2.6.22-vanilla kernel.org: 2.6.22.14
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment