diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 05:57:45 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 05:57:45 -0500 |
commit | c47c1b1f3a9d6973108020df1dcab7604f7774dd (patch) | |
tree | 4061a58204eb7c5c86a13fb3cb397f7dbf4d9d60 /arch/x86/include/asm/page.h | |
parent | e5f7f202f31fd05e9de7e1ba5a7b30de7855f5aa (diff) |
x86, pgtable.h: fix 2-level 32-bit build
- pmd_flags() needs to be available on 2-levels too
- provide pud_large() wrapper as well
- include page.h - it provides basic types relied on by pgtable.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/page.h')
-rw-r--r-- | arch/x86/include/asm/page.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index 0b16b64a8fe7..823cc931363f 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h | |||
@@ -139,10 +139,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) | |||
139 | return pmd.pmd; | 139 | return pmd.pmd; |
140 | } | 140 | } |
141 | 141 | ||
142 | static inline pmdval_t pmd_flags(pmd_t pmd) | ||
143 | { | ||
144 | return native_pmd_val(pmd) & PTE_FLAGS_MASK; | ||
145 | } | ||
146 | #else /* PAGETABLE_LEVELS == 2 */ | 142 | #else /* PAGETABLE_LEVELS == 2 */ |
147 | #include <asm-generic/pgtable-nopmd.h> | 143 | #include <asm-generic/pgtable-nopmd.h> |
148 | 144 | ||
@@ -152,6 +148,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) | |||
152 | } | 148 | } |
153 | #endif /* PAGETABLE_LEVELS >= 3 */ | 149 | #endif /* PAGETABLE_LEVELS >= 3 */ |
154 | 150 | ||
151 | static inline pmdval_t pmd_flags(pmd_t pmd) | ||
152 | { | ||
153 | return native_pmd_val(pmd) & PTE_FLAGS_MASK; | ||
154 | } | ||
155 | |||
155 | static inline pte_t native_make_pte(pteval_t val) | 156 | static inline pte_t native_make_pte(pteval_t val) |
156 | { | 157 | { |
157 | return (pte_t) { .pte = val }; | 158 | return (pte_t) { .pte = val }; |