merge b_md into HEAD:

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

diff --git a/lustre/patches/patch-2.4.18-um b/lustre/patches/patch-2.4.18-um
index 6e1e345..80c19a1 100644 (file)
--- a/lustre/patches/patch-2.4.18-um
+++ b/lustre/patches/patch-2.4.18-um
@@ -47,3 +47,14 @@
        return(0);
  }
  
+--- /usr/src/lum/include/asm/pgtable.h.orig    2002-12-04 01:58:36.000000000 -0700
++++ /usr/src/lum/include/asm/pgtable.h 2002-12-04 01:58:54.000000000 -0700
+@@ -200,7 +200,7 @@ static inline void pgd_clear(pgd_t * pgd
+  * called on a highmem page.
+  */
+ 
+-#define page_address(page) ({ if (!(page)->virtual) BUG(); (page)->virtual; })
++//#define page_address(page) ({ if (!(page)->virtual) BUG(); (page)->virtual; })
+ #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
+ 
+ extern struct page *pte_mem_map(pte_t pte);