From 560efd999a3f9fe35f3e757a12a2bff459961b6d Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Fri, 18 Jun 2010 12:23:57 +0900 Subject: [PATCH] --- yaml --- r: 205493 b: refs/heads/master c: 35be1b716a475717611b2dc04185e9d80b9cb693 h: refs/heads/master i: 205491: 5a28766415850838d0cd8bb860eb1b3615f935d2 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/ioremap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 136e83a6e4fb..4492998315b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffa71f33a820d1ab3f2fc5723819ac60fb76080b +refs/heads/master: 35be1b716a475717611b2dc04185e9d80b9cb693 diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c index 754cb4cbce66..d41d3a9036ca 100644 --- a/trunk/arch/x86/mm/ioremap.c +++ b/trunk/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)))