From 3082519b13c6b02a64deb9031b533b7858716d76 Mon Sep 17 00:00:00 2001
From: keith mannthey <kmannth@us.ibm.com>
Date: Mon, 25 Sep 2006 16:24:39 -0700
Subject: [PATCH] --- yaml --- r: 35527 b: refs/heads/master c:
 24fd425edd53ea580cad917e825c1f6715e9b939 h: refs/heads/master i:   35525:
 deb269de50fe3b6835fe823514acfcd9b611c56b   35523:
 69d999a8fd2cf5e3540b40d26edffbf7655df337   35519:
 e9c549fd040dfd48bfcb7ca51b669af3092036dd v: v3

---
 [refs]                            | 2 +-
 trunk/arch/i386/mm/boot_ioremap.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 42bf7e9e52c4..4d114e5c46bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b16f21f144010aa627c58b3a33be49ebfd685dc
+refs/heads/master: 24fd425edd53ea580cad917e825c1f6715e9b939
diff --git a/trunk/arch/i386/mm/boot_ioremap.c b/trunk/arch/i386/mm/boot_ioremap.c
index 5d44f4f5ff59..4de11f508c3a 100644
--- a/trunk/arch/i386/mm/boot_ioremap.c
+++ b/trunk/arch/i386/mm/boot_ioremap.c
@@ -29,8 +29,11 @@
  */
 
 #define BOOT_PTE_PTRS (PTRS_PER_PTE*2)
-#define boot_pte_index(address) \
-	     (((address) >> PAGE_SHIFT) & (BOOT_PTE_PTRS - 1))
+
+static unsigned long boot_pte_index(unsigned long vaddr) 
+{
+	return __pa(vaddr) >> PAGE_SHIFT;
+}
 
 static inline boot_pte_t* boot_vaddr_to_pte(void *address)
 {