Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754107Ab0GITTX (ORCPT ); Fri, 9 Jul 2010 15:19:23 -0400 Received: from hera.kernel.org ([140.211.167.34]:57761 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753491Ab0GITTV (ORCPT ); Fri, 9 Jul 2010 15:19:21 -0400 Date: Fri, 9 Jul 2010 19:19:00 GMT From: tip-bot for Kenji Kaneshige Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, kaneshige.kenji@jp.fujitsu.com, tglx@linutronix.de, hpa@linux.intel.com Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, kaneshige.kenji@jp.fujitsu.com, hpa@linux.intel.com In-Reply-To: <4C1AE6CD.1080704@jp.fujitsu.com> References: <4C1AE6CD.1080704@jp.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86, ioremap: Fix normal ram range check Message-ID: Git-Commit-ID: 35be1b716a475717611b2dc04185e9d80b9cb693 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Fri, 09 Jul 2010 19:19:00 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1567 Lines: 37 Commit-ID: 35be1b716a475717611b2dc04185e9d80b9cb693 Gitweb: http://git.kernel.org/tip/35be1b716a475717611b2dc04185e9d80b9cb693 Author: Kenji Kaneshige AuthorDate: Fri, 18 Jun 2010 12:23:57 +0900 Committer: H. Peter Anvin 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 LKML-Reference: <4C1AE6CD.1080704@jp.fujitsu.com> Signed-off-by: H. Peter Anvin --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/