Tweak autogen.sh and Makefiles to be compatible with Automake 1.6.2.

[fs/lustre-release.git] / lustre / patches / patch-2.4.18

diff --git a/lustre/patches/patch-2.4.18 b/lustre/patches/patch-2.4.18
index f0ab311..658124b 100644 (file)
--- a/lustre/patches/patch-2.4.18
+++ b/lustre/patches/patch-2.4.18
@@ -13,47 +13,6 @@
  int
  do_check_pgt_cache (int low, int high)
  {
---- 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
-@@ -527,6 +527,22 @@
-       return(phys_mem_map(pte_val(pte)));
- }
- 
-+struct page *check_get_page(unsigned long kaddr)
-+{
-+        struct page *page;
-+        struct mem_region *mr;
-+        unsigned long phys = __pa(kaddr);
-+      unsigned int n = phys_region_index(phys);
-+
-+      if(regions[n] == NULL) 
-+                return NULL; 
-+
-+        mr = regions[n];
-+        page = (struct page *) mr->mem_map;
-+      return page + ((phys_addr(phys)) >> PAGE_SHIFT);
-+}
-+
-+
- struct mem_region *page_region(struct page *page, int *index_out)
- {
-       int i;
-@@ -542,12 +558,14 @@
-                       return(region);
-               }
-       }
--      panic("No region found for page");
-+//panic("No region found for page");
-       return(NULL);
- }
- 
- struct page *page_mem_map(struct page *page)
- {
-+        if (!page_region(page, NULL))
-+            return NULL; 
-       return((struct page *) page_region(page, NULL)->mem_map);
- }
- 
 --- lum-pristine/arch/i386/mm/init.c   Fri Dec 21 10:41:53 2001
 +++ lum/arch/i386/mm/init.c    Thu Jul  4 10:04:25 2002
 @@ -43,6 +43,12 @@