From 87405f0a3a8f0f124c3ca42f2606d966a2cd0f8b Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 5 Feb 2009 11:31:02 -0800
Subject: [PATCH] --- yaml --- r: 136799 b: refs/heads/master c:
 01ade20d5a22e6ef002cbb751dddc3a01a78f998 h: refs/heads/master i:   136797:
 5b780f1261de30ff68baa578bde62283fda18019   136795:
 da78d82808d2f1cf2cbd115fbece03ef4aee3134   136791:
 06bd82190a0d4ffc35b92514122517a0ff56058d   136783:
 61901a9a7b7ad0b75b7bd000ce4b05a26012c8f4   136767:
 50a866b6d306efb302496213c67d42298b131f76 v: v3

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

diff --git a/[refs] b/[refs]
index b7c625fabb87..4df9a2a0dcb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e24d7eee0beda24504bf6a4aa03be68328557475
+refs/heads/master: 01ade20d5a22e6ef002cbb751dddc3a01a78f998
diff --git a/trunk/arch/x86/include/asm/pgtable-3level.h b/trunk/arch/x86/include/asm/pgtable-3level.h
index 28ba09ac2308..7ad9d05710b1 100644
--- a/trunk/arch/x86/include/asm/pgtable-3level.h
+++ b/trunk/arch/x86/include/asm/pgtable-3level.h
@@ -115,10 +115,6 @@ static inline void pud_clear(pud_t *pudp)
 		write_cr3(pgd);
 }
 
-/* Find an entry in the second-level page table.. */
-#define pmd_offset(pud, address) ((pmd_t *)pud_page_vaddr(*(pud)) +	\
-				  pmd_index(address))
-
 #ifdef CONFIG_SMP
 static inline pte_t native_ptep_get_and_clear(pte_t *ptep)
 {
diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h
index 4ec24b6d0994..a7dbb05075d2 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -504,6 +504,12 @@ static inline struct page *pud_page(pud_t pud)
 {
 	return pfn_to_page(pud_val(pud) >> PAGE_SHIFT);
 }
+
+/* Find an entry in the second-level page table.. */
+static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
+{
+	return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);
+}
 #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 15f42d6ee2fd..78269656cf01 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_offset(dir, address) ((pmd_t *)pud_page_vaddr(*(dir)) + \
-				  pmd_index(address))
 #define pfn_pmd(nr, prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val((prot))))
 #define pmd_pfn(x)  ((pmd_val((x)) & __PHYSICAL_MASK) >> PAGE_SHIFT)