From 1dfc07aad5479f1fb832ff6f61a5a9ce822d9e1f Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Sun, 8 Feb 2009 23:24:26 -0800
Subject: [PATCH] x86: move 2 and 3 level asm-generic defs into page-defs

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
---
 arch/x86/include/asm/page.h       | 4 ----
 arch/x86/include/asm/page_types.h | 4 ++++
 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)
 	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 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;
 
 #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;
-- 
2.20.1