From 9aaff870754b89dd9959717149a072b147c4fe44 Mon Sep 17 00:00:00 2001
From: Zachary Amsden <zach@vmware.com>
Date: Thu, 7 Dec 2006 02:14:08 +0100
Subject: [PATCH] --- yaml --- r: 43079 b: refs/heads/master c:
 a2952d8949bb0b37c1be92a89c4f180c74292857 h: refs/heads/master i:   43077:
 87ad24cfa2c6294ff81987c5efe0184bcc6e7348   43075:
 0a4f40d329d1242c58804daacf36a5c86cf8ff1b   43071:
 bfe9453dd20d189a3dfe30adfff1a957f30ef73f v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-i386/page.h           | 2 ++
 trunk/include/asm-i386/pgtable-2level.h | 2 --
 trunk/include/asm-i386/pgtable-3level.h | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 81967aa48f42..7177757d7659 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd472c794bbf6771c3fc1c58f188bc16c393d2fe
+refs/heads/master: a2952d8949bb0b37c1be92a89c4f180c74292857
diff --git a/trunk/include/asm-i386/page.h b/trunk/include/asm-i386/page.h
index 2b69686107ae..fd3f64ace248 100644
--- a/trunk/include/asm-i386/page.h
+++ b/trunk/include/asm-i386/page.h
@@ -52,6 +52,7 @@ typedef struct { unsigned long long pgprot; } pgprot_t;
 #define pte_val(x)	((x).pte_low | ((unsigned long long)(x).pte_high << 32))
 #define __pmd(x) ((pmd_t) { (x) } )
 #define HPAGE_SHIFT	21
+#include <asm-generic/pgtable-nopud.h>
 #else
 typedef struct { unsigned long pte_low; } pte_t;
 typedef struct { unsigned long pgd; } pgd_t;
@@ -59,6 +60,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define boot_pte_t pte_t /* or would you rather have a typedef */
 #define pte_val(x)	((x).pte_low)
 #define HPAGE_SHIFT	22
+#include <asm-generic/pgtable-nopmd.h>
 #endif
 #define PTE_MASK	PAGE_MASK
 
diff --git a/trunk/include/asm-i386/pgtable-2level.h b/trunk/include/asm-i386/pgtable-2level.h
index 04d6186abc22..c08cbc4c2d8b 100644
--- a/trunk/include/asm-i386/pgtable-2level.h
+++ b/trunk/include/asm-i386/pgtable-2level.h
@@ -1,8 +1,6 @@
 #ifndef _I386_PGTABLE_2LEVEL_H
 #define _I386_PGTABLE_2LEVEL_H
 
-#include <asm-generic/pgtable-nopmd.h>
-
 #define pte_ERROR(e) \
 	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)
 #define pgd_ERROR(e) \
diff --git a/trunk/include/asm-i386/pgtable-3level.h b/trunk/include/asm-i386/pgtable-3level.h
index 2a6e67db8bc3..54287f148c74 100644
--- a/trunk/include/asm-i386/pgtable-3level.h
+++ b/trunk/include/asm-i386/pgtable-3level.h
@@ -1,8 +1,6 @@
 #ifndef _I386_PGTABLE_3LEVEL_H
 #define _I386_PGTABLE_3LEVEL_H
 
-#include <asm-generic/pgtable-nopud.h>
-
 /*
  * Intel Physical Address Extension (PAE) Mode - three-level page
  * tables on PPro+ CPUs.