x86: move pte types into pgtable*.h

[pandora-kernel.git] / arch / x86 / include / asm / page_32_types.h

diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index 83f820a..b5486aa 100644 (file)
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -43,36 +43,6 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/types.h>
-
-#ifdef CONFIG_X86_PAE
-typedef u64    pteval_t;
-typedef u64    pmdval_t;
-typedef u64    pudval_t;
-typedef u64    pgdval_t;
-typedef u64    pgprotval_t;
-
-typedef union {
-       struct {
-               unsigned long pte_low, pte_high;
-       };
-       pteval_t pte;
-} pte_t;
-#else  /* !CONFIG_X86_PAE */
-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 union {
-       pteval_t pte;
-       pteval_t pte_low;
-} pte_t;
-#endif /* CONFIG_X86_PAE */
-
-extern int nx_enabled;
-
 /*
  * This much address space is reserved for vmalloc() and iomap()
  * as well as fixmap mappings.