aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/page.h4
-rw-r--r--arch/x86/include/asm/page_types.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index 3b2d2af951c3..da54f6c48a7f 100644
--- 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)
58 return pud.pud; 58 return pud.pud;
59} 59}
60#else /* PAGETABLE_LEVELS == 3 */ 60#else /* PAGETABLE_LEVELS == 3 */
61#include <asm-generic/pgtable-nopud.h>
62
63static inline pudval_t native_pud_val(pud_t pud) 61static inline pudval_t native_pud_val(pud_t pud)
64{ 62{
65 return native_pgd_val(pud.pgd); 63 return native_pgd_val(pud.pgd);
@@ -82,8 +80,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
82} 80}
83 81
84#else /* PAGETABLE_LEVELS == 2 */ 82#else /* PAGETABLE_LEVELS == 2 */
85#include <asm-generic/pgtable-nopmd.h>
86
87static inline pmdval_t native_pmd_val(pmd_t pmd) 83static inline pmdval_t native_pmd_val(pmd_t pmd)
88{ 84{
89 return native_pgd_val(pmd.pud.pgd); 85 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 65787ad4c59f..92dfd251a659 100644
--- 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;
53 53
54#if PAGETABLE_LEVELS > 3 54#if PAGETABLE_LEVELS > 3
55typedef struct { pudval_t pud; } pud_t; 55typedef struct { pudval_t pud; } pud_t;
56#else
57#include <asm-generic/pgtable-nopud.h>
56#endif 58#endif
57 59
58#if PAGETABLE_LEVELS > 2 60#if PAGETABLE_LEVELS > 2
59typedef struct { pmdval_t pmd; } pmd_t; 61typedef struct { pmdval_t pmd; } pmd_t;
62#else
63#include <asm-generic/pgtable-nopmd.h>
60#endif 64#endif
61 65
62typedef struct page *pgtable_t; 66typedef struct page *pgtable_t;