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

---
 [refs]                                  | 2 +-
 trunk/arch/x86/include/asm/pgtable.h    | 5 +++++
 trunk/arch/x86/include/asm/pgtable_64.h | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 95abff6a26ad..42198924b54c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fea801ac95d6534a93aa01d3ac62be163d845af
+refs/heads/master: c5f040b12b2381591932a007432e7ed86b3f2796
diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h
index 2f38bbee77e7..cca4321e0760 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -469,6 +469,11 @@ static inline int pgd_present(pgd_t pgd)
 {
 	return pgd_val(pgd) & _PAGE_PRESENT;
 }
+
+static inline unsigned long pgd_page_vaddr(pgd_t pgd)
+{
+	return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);
+}
 #endif	/* PAGETABLE_LEVELS > 3 */
 
 #endif	/* __ASSEMBLY__ */
diff --git a/trunk/arch/x86/include/asm/pgtable_64.h b/trunk/arch/x86/include/asm/pgtable_64.h
index f3ad89433246..4f8dbb99b692 100644
--- a/trunk/arch/x86/include/asm/pgtable_64.h
+++ b/trunk/arch/x86/include/asm/pgtable_64.h
@@ -179,8 +179,6 @@ static inline int pmd_bad(pmd_t pmd)
 /*
  * Level 4 access.
  */
-#define pgd_page_vaddr(pgd)						\
-	((unsigned long)__va((unsigned long)pgd_val((pgd)) & PTE_PFN_MASK))
 #define pgd_page(pgd)		(pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT))
 static inline int pgd_large(pgd_t pgd) { return 0; }
 #define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE)