[tip:x86/mm] x86, ioremap: Fix normal ram range check
in [Kernel]
|
Prev: [S+Q2 12/19] slub: Dynamically size kmalloc cache allocations
Next: unable to handle kernel paging request at 40000000 __alloc_memory_core_early+0x147/0x1d6
From: tip-bot for Kenji Kaneshige on 9 Jul 2010 15:20 Commit-ID: 35be1b716a475717611b2dc04185e9d80b9cb693 Gitweb: http://git.kernel.org/tip/35be1b716a475717611b2dc04185e9d80b9cb693 Author: Kenji Kaneshige <kaneshige.kenji(a)jp.fujitsu.com> AuthorDate: Fri, 18 Jun 2010 12:23:57 +0900 Committer: H. Peter Anvin <hpa(a)linux.intel.com> CommitDate: Fri, 9 Jul 2010 11:42:11 -0700 x86, ioremap: Fix normal ram range check 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(a)jp.fujitsu.com> LKML-Reference: <4C1AE6CD.1080704(a)jp.fujitsu.com> Signed-off-by: H. Peter Anvin <hpa(a)linux.intel.com> --- arch/x86/mm/ioremap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 754cb4c..d41d3a9 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -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))) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |