b=bug11890

- Fixed an error in compilation for i386.
- the 0copy patch for ext3 shouldn't apply on this branch since it doesn't have delay-allocation patch merged.

diff --git a/lustre/kernel_patches/patches/raid5-zerocopy.patch b/lustre/kernel_patches/patches/raid5-zerocopy.patch
index 5de45a7..1a43431 100644 (file)
--- a/lustre/kernel_patches/patches/raid5-zerocopy.patch
+++ b/lustre/kernel_patches/patches/raid5-zerocopy.patch
@@ -144,7 +144,7 @@ diff -pru linux-2.6.9.orig/drivers/md/raid5.c linux-2.6.9/drivers/md/raid5.c
 +                      if (PageHighMem(page)) {
 +                              h_ptr[1] = kmap_atomic(page, KM_USER0);
 +                              xor_block(2, STRIPE_SIZE, h_ptr);
-+                              kunmap_atomic(page, MK_USER0);
++                              kunmap_atomic(page, KM_USER0);
 +                      } else {
 +                              ptr[count++] = page_address(page);
                        }
@@ -170,7 +170,7 @@ diff -pru linux-2.6.9.orig/drivers/md/raid5.c linux-2.6.9/drivers/md/raid5.c
 +                      if (PageHighMem(page)) {
 +                              h_ptr[1] = kmap_atomic(page, KM_USER0);
 +                              xor_block(2, STRIPE_SIZE, h_ptr);
-+                              kunmap_atomic(page, MK_USER0);
++                              kunmap_atomic(page, KM_USER0);
 +                      } else {
 +                              ptr[count++] = page_address(page);
                        }