x86: page.h: move and unify types for pagetable entry, #3

based on:

 Subject: x86: page.h: move and unify types for pagetable entry
 From: Jeremy Fitzhardinge <jeremy@goop.org>

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
index 911d7e0..a522fba 100644 (file)
--- a/include/asm-x86/page.h
+++ b/include/asm-x86/page.h
@@ -79,6 +79,19 @@
 #ifndef __ASSEMBLY__
 void clear_page(void *page);
 void copy_page(void *to, void *from);
+
+/*
+ * These are used to make use of C type-checking..
+ */
+typedef unsigned long  pteval_t;
+typedef unsigned long  pmdval_t;
+typedef unsigned long  pudval_t;
+typedef unsigned long  pgdval_t;
+typedef unsigned long  pgprotval_t;
+typedef unsigned long  phys_addr_t;
+
+typedef struct { pteval_t pte; } pte_t;
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* CONFIG_X86_64 */

diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h
index f5e0543..f5e82c6 100644 (file)
--- a/include/asm-x86/page_64.h
+++ b/include/asm-x86/page_64.h
@@ -10,7 +10,6 @@ extern unsigned long end_pfn_map;
 /*
  * These are used to make use of C type-checking..
  */
-typedef struct { unsigned long pte; } pte_t;
 typedef struct { unsigned long pmd; } pmd_t;
 typedef struct { unsigned long pud; } pud_t;
 typedef struct { unsigned long pgd; } pgd_t;