Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-x86 / page_64.h

diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h
index ebf977a809a8e9a1efcb7ae23553bc7e9c25ca13..f7393bc516eff1c1d25ad799f0441f734a151280 100644 (file)
--- a/include/asm-x86/page_64.h
+++ b/include/asm-x86/page_64.h
@@ -23,6 +23,9 @@
 #define MCE_STACK 5
 #define N_EXCEPTION_STACKS 5  /* hw limit: 7 */
 
+#define PUD_PAGE_SIZE          (_AC(1, UL) << PUD_SHIFT)
+#define PUD_PAGE_MASK          (~(PUD_PAGE_SIZE-1))
+
 #define __PAGE_OFFSET           _AC(0xffff810000000000, UL)
 
 #define __PHYSICAL_START       CONFIG_PHYSICAL_START
@@ -68,10 +71,9 @@ typedef unsigned long        pgdval_t;
 typedef unsigned long  pgprotval_t;
 typedef unsigned long  phys_addr_t;
 
-typedef struct { pteval_t pte; } pte_t;
+typedef struct page *pgtable_t;
 
-#define native_pte_val(x)      ((x).pte)
-#define native_make_pte(x) ((pte_t) { (x) } )
+typedef struct { pteval_t pte; } pte_t;
 
 #define vmemmap ((struct page *)VMEMMAP_START)