Make the usermode patch apply cleanly.

diff --git a/lustre/patches/patch-2.4.18-um b/lustre/patches/patch-2.4.18-um
index e7e835f..78b5196 100644 (file)
--- a/lustre/patches/patch-2.4.18-um
+++ b/lustre/patches/patch-2.4.18-um
@@ -1,5 +1,5 @@
---- lum-pristine/arch/um/kernel/mem.c  Sat Jul 13 13:20:13 2002
-+++ lum/arch/um/kernel/mem.c   Thu Jul  4 10:04:25 2002
+--- lum-pristine/arch/um/kernel/mem.c.orig     Sat Jul 20 19:05:51 2002
++++ lum/arch/um/kernel/mem.c   Sat Jul 20 19:07:18 2002
 @@ -527,6 +527,22 @@
        return(phys_mem_map(pte_val(pte)));
  }
@@ -39,13 +39,12 @@
        return((struct page *) page_region(page, NULL)->mem_map);
  }
  
---- lum/arch/um/kernel/mem.c~   Wed Jul 17 11:23:15 2002
-+++ lum/arch/um/kernel/mem.c    Wed Jul 17 11:28:48 2002
-@@ -582,7 +582,7 @@
-                   (addr <= region->start + region->len))
-                        return(mk_phys(addr - region->start, i));
-        }
--       panic("region_pa : no region for virtual address");
-+       //panic("region_pa : no region for virtual address");
-        return(0);
+@@ -564,7 +582,7 @@
+                  (addr <= region->start + region->len))
+                       return(mk_phys(addr - region->start, i));
+       }
+-      panic("region_pa : no region for virtual address");
++      //panic("region_pa : no region for virtual address");
+       return(0);
  }
+