Commit 24fd425e authored Sep 25, 2006 by keith mannthey Committed by Linus Torvalds Sep 25, 2006

[PATCH] i386 bootioremap / kexec fix



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.

[ Keith says this is applicable to 2.6.16 and 2.6.17 as well ]

Signed-off-by: Keith <Mannthey&lt;kmannth@us.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: <stable@kernel.org>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 0b16f21f

arch/i386/mm/boot_ioremap.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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)
		{