---

yaml --- r: 97008 b: refs/heads/master c: c57c05d h: refs/heads/master v: v3
git-mirror · May 20, 2008 · 52c8341 · 52c8341
1 parent 1f62d96
commit 52c8341
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bb271db63c356212564aad050b2cf026f800858
+refs/heads/master: c57c05d0032cd5a500c5eba18ede4867a6d2cd5f
diff --git a/trunk/include/asm-x86/page.h b/trunk/include/asm-x86/page.h
@@ -10,6 +10,9 @@
 
 #ifdef __KERNEL__
 
+#define __PHYSICAL_MASK		((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1)
+#define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)
+
 /* Cast PAGE_MASK to a signed type so that it is sign-extended if
    virtual addresses are 32-bits but physical addresses are larger
    (ie, 32-bit PAE). */
@@ -29,9 +32,6 @@
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
 
-#define __PHYSICAL_MASK		((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1)
-#define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)
-
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
 #endif