]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
x86, ioremap: Fix normal ram range check
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Fri, 18 Jun 2010 03:23:57 +0000 (12:23 +0900)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 9 Jul 2010 18:42:11 +0000 (11:42 -0700)
Check for normal RAM in x86 ioremap() code seems to not work for the
last page frame in the specified physical address range.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
LKML-Reference: <4C1AE6CD.1080704@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/mm/ioremap.c

index 754cb4cbce66206196c8bacdf09caf9eb13623d4..d41d3a9036caad2210d27c7a8e00f31f89e2a123 100644 (file)
@@ -101,7 +101,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
         * Don't allow anybody to remap normal RAM that we're using..
         */
        last_pfn = last_addr >> PAGE_SHIFT;
-       for (pfn = phys_addr >> PAGE_SHIFT; pfn < last_pfn; pfn++) {
+       for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
                int is_ram = page_is_ram(pfn);
 
                if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))