[Patch] i386 bootioremap / kexec fix

keith mannthey
2006-09-22T02:54:49Z

With CONFIG_PHYSICAL_START set to a non default values the i386
boot_ioremap code calculated its pte index wrong and users of
boot_ioremap have their areas incorrectly mapped (for me SRAT table not
mapped during early boot). This patch removes the addr < BOOT_PTE_PTRS
constraint.

Signed-off-by: Keith Mannthey<kmannth@us.ibm.com>
---
boot_ioremap.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff -urN linux-2.6.18-rc6-mm2-orig/arch/i386/mm/boot_ioremap.c
linux-2.6.17/arch/i386/mm/boot_ioremap.c
--- linux-2.6.18-rc6-mm2-orig/arch/i386/mm/boot_ioremap.c 2006-09-18
01:19:22.000000000 -0700
+++ linux-2.6.17/arch/i386/mm/boot_ioremap.c 2006-09-18
01:23:33.000000000 -0700
@@ -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)
{