From 06bd82190a0d4ffc35b92514122517a0ff56058d Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 5 Feb 2009 11:30:54 -0800
Subject: [PATCH] --- yaml --- r: 136791 b: refs/heads/master c:
 aca159dbb13a5221819d5b3849b8c013f4829e9e h: refs/heads/master i:   136789:
 9eec1f3851f80056e8f9e07c98954e6319b3a5c7   136787:
 54d0db23cde315301e191e8426af6a761142a2eb   136783:
 61901a9a7b7ad0b75b7bd000ce4b05a26012c8f4 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86/include/asm/pgtable.h | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index bb4bda412e47..a51dadc8f9e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fff47e3ac5e17f7e164ac4ff9ea29aba3c54d73
+refs/heads/master: aca159dbb13a5221819d5b3849b8c013f4829e9e
diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h
index 4638b4af6750..bd38feb34921 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -429,6 +429,16 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base)
 }
 #endif	/* CONFIG_PARAVIRT */
 
+#endif	/* __ASSEMBLY__ */
+
+#ifdef CONFIG_X86_32
+# include "pgtable_32.h"
+#else
+# include "pgtable_64.h"
+#endif
+
+#ifndef __ASSEMBLY__
+
 static inline int pte_none(pte_t pte)
 {
 	return !pte.pte;
@@ -483,12 +493,6 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
 
 #endif	/* __ASSEMBLY__ */
 
-#ifdef CONFIG_X86_32
-# include "pgtable_32.h"
-#else
-# include "pgtable_64.h"
-#endif
-
 /*
  * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
  *