x86: move 2 and 3 level asm-generic defs into page-defs

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>

diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index 3b2d2af951c31058f87365378976c0560e42db63..da54f6c48a7f05b01aa90fc1da7c3f541e93214e 100644 (file)
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -58,8 +58,6 @@ static inline pudval_t native_pud_val(pud_t pud)
        return pud.pud;
 }
 #else  /* PAGETABLE_LEVELS == 3 */
-#include <asm-generic/pgtable-nopud.h>
-
 static inline pudval_t native_pud_val(pud_t pud)
 {
        return native_pgd_val(pud.pgd);
@@ -82,8 +80,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
 }
 
 #else  /* PAGETABLE_LEVELS == 2 */
-#include <asm-generic/pgtable-nopmd.h>
-
 static inline pmdval_t native_pmd_val(pmd_t pmd)
 {
        return native_pgd_val(pmd.pud.pgd);

diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 65787ad4c59f68bea69e0b6d9338e86b526d8d76..92dfd251a659ffdea79c0de98e61e0aa40c0e193 100644 (file)
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -53,10 +53,14 @@ typedef struct { pgprotval_t pgprot; } pgprot_t;
 
 #if PAGETABLE_LEVELS > 3
 typedef struct { pudval_t pud; } pud_t;
+#else
+#include <asm-generic/pgtable-nopud.h>
 #endif
 
 #if PAGETABLE_LEVELS > 2
 typedef struct { pmdval_t pmd; } pmd_t;
+#else
+#include <asm-generic/pgtable-nopmd.h>
 #endif
 
 typedef struct page *pgtable_t;