From 24d3f17371cdf0e4995997d26c4da39841304153 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 5 Feb 2009 11:31:04 -0800
Subject: [PATCH] --- yaml --- r: 136801 b: refs/heads/master c:
 3180fba0eec0d14e4ac8183a90d643d0d3383c75 h: refs/heads/master i:   136799:
 87405f0a3a8f0f124c3ca42f2606d966a2cd0f8b 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 2a326391109c..2c1b9558c678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd44d64db1db6acf2dea9ba130b8cb0a54e1dabd
+refs/heads/master: 3180fba0eec0d14e4ac8183a90d643d0d3383c75
diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h
index a7dbb05075d2..532144c2f1cc 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -510,6 +510,11 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
 {
 	return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);
 }
+
+static inline unsigned long pmd_pfn(pmd_t pmd)
+{
+	return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;
+}
 #endif	/* PAGETABLE_LEVELS > 2 */
 
 #if PAGETABLE_LEVELS > 3
diff --git a/trunk/arch/x86/include/asm/pgtable_64.h b/trunk/arch/x86/include/asm/pgtable_64.h
index 6cc4133705b9..279ddc6a4eb8 100644
--- a/trunk/arch/x86/include/asm/pgtable_64.h
+++ b/trunk/arch/x86/include/asm/pgtable_64.h
@@ -191,8 +191,6 @@ static inline int pud_large(pud_t pte)
 }
 
 /* PMD  - Level 2 access */
-#define pmd_pfn(x)  ((pmd_val((x)) & __PHYSICAL_MASK) >> PAGE_SHIFT)
-
 #define pte_to_pgoff(pte) ((pte_val((pte)) & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT)
 #define pgoff_to_pte(off) ((pte_t) { .pte = ((off) << PAGE_SHIFT) |	\
 					    _PAGE_FILE })