summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/page_32_types.h
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-02-11 10:20:05 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-02-11 14:54:10 -0800
commit54321d947ae9d6a051b81e3eccaf2d8658aeecc6 (patch)
tree2843c22a872d39cf815ca0d6b250bb8684dadb2b /arch/x86/include/asm/page_32_types.h
parente2f5bda94152fa567f6b48126741014123f982b8 (diff)
downloadlinux-0-day-54321d947ae9d6a051b81e3eccaf2d8658aeecc6.tar.gz
linux-0-day-54321d947ae9d6a051b81e3eccaf2d8658aeecc6.tar.xz
x86: move pte types into pgtable*.h
pgtable*.h is intended for definitions relating to actual pagetables and their entries, so move all the definitions for (pte|pmd|pud|pgd)(val)?_t to the appropriate pgtable*.h headers. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86/include/asm/page_32_types.h')
-rw-r--r--arch/x86/include/asm/page_32_types.h30
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index 83f820a2b108f..b5486aaf36ec7 100644
--- 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.