From cb49813fbc0d37e685acc603cb810aebd5163418 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 5 Feb 2009 11:31:06 -0800
Subject: [PATCH] --- yaml --- r: 136803 b: refs/heads/master c:
 346309cff6127a38731cf102de3413a562700b84 h: refs/heads/master i:   136801:
 24d3f17371cdf0e4995997d26c4da39841304153   136799:
 87405f0a3a8f0f124c3ca42f2606d966a2cd0f8b v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/x86/include/asm/pgtable.h    | 11 +++++++++++
 trunk/arch/x86/include/asm/pgtable_32.h |  8 --------
 trunk/arch/x86/include/asm/pgtable_64.h |  1 -
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 58dd93938664..7846e516a772 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97e2817d3423d753fd2f80ea936a370032846382
+refs/heads/master: 346309cff6127a38731cf102de3413a562700b84
diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h
index 49b5cff78c28..10a8c2e51789 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -498,6 +498,17 @@ static inline unsigned pmd_index(unsigned long address)
  */
 #define mk_pte(page, pgprot)   pfn_pte(page_to_pfn(page), (pgprot))
 
+/*
+ * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
+ *
+ * this function returns the index of the entry in the pte page which would
+ * control the given virtual address
+ */
+static inline unsigned pte_index(unsigned long address)
+{
+	return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);
+}
+
 #if PAGETABLE_LEVELS > 2
 static inline int pud_present(pud_t pud)
 {
diff --git a/trunk/arch/x86/include/asm/pgtable_32.h b/trunk/arch/x86/include/asm/pgtable_32.h
index 6335be843c16..00d298e14a8f 100644
--- a/trunk/arch/x86/include/asm/pgtable_32.h
+++ b/trunk/arch/x86/include/asm/pgtable_32.h
@@ -97,14 +97,6 @@ extern unsigned long pg0[];
 
 static inline int pud_large(pud_t pud) { return 0; }
 
-/*
- * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
- *
- * this macro returns the index of the entry in the pte page which would
- * control the given virtual address
- */
-#define pte_index(address)					\
-	(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address)				\
 	((pte_t *)pmd_page_vaddr(*(dir)) +  pte_index((address)))
 
diff --git a/trunk/arch/x86/include/asm/pgtable_64.h b/trunk/arch/x86/include/asm/pgtable_64.h
index adce05628a01..e7321bc8aa81 100644
--- a/trunk/arch/x86/include/asm/pgtable_64.h
+++ b/trunk/arch/x86/include/asm/pgtable_64.h
@@ -198,7 +198,6 @@ static inline int pud_large(pud_t pte)
 
 /* PTE - Level 1 access. */
 
-#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \
 					 pte_index((address)))