From: Ingo Molnar Date: Tue, 29 Apr 2008 10:04:51 +0000 (+0200) Subject: revert: "x86: ioremap(), extend check to all RAM pages" X-Git-Tag: v2.6.26-rc1~98^2~10 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2544a873ab2a1ee9196bb2f4b12c3afd44ec8a06;p=linux-2.6-omap-h63xx.git revert: "x86: ioremap(), extend check to all RAM pages" Vegard Nossum reported a large (150 seconds) boot delay during bootup, and bisected it to "x86: ioremap(), extend check to all RAM pages" (commit bdd3cee2e4b). Revert this commit for now. Bisected-by: Vegard Nossum Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 804de18abcc..0be9f9c59aa 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -148,8 +148,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, /* * Don't allow anybody to remap normal RAM that we're using.. */ - for (pfn = phys_addr >> PAGE_SHIFT; - (pfn << PAGE_SHIFT) < last_addr; pfn++) { + for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped && + (pfn << PAGE_SHIFT) < last_addr; pfn++) { int is_ram = page_is_ram(pfn);