Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934632AbbGVP0X (ORCPT ); Wed, 22 Jul 2015 11:26:23 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56359 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934418AbbGVP0V (ORCPT ); Wed, 22 Jul 2015 11:26:21 -0400 Date: Wed, 22 Jul 2015 08:25:23 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: toshi.kani@hp.com, hpa@zytor.com, roland@purestorage.com, mingo@kernel.org, dan.j.williams@intel.com, mingo@redhat.com, bp@alien8.de, mcgrof@suse.com, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: mcgrof@suse.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, mingo@kernel.org, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, roland@purestorage.com, toshi.kani@hp.com In-Reply-To: <1437088996-28511-2-git-send-email-toshi.kani@hp.com> References: <1437088996-28511-2-git-send-email-toshi.kani@hp.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/mm: Move warning from __ioremap_check_ram() to the call site Git-Commit-ID: 1c9cf9b211030a454a84cbc1cb15b82d9aa49011 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2541 Lines: 69 Commit-ID: 1c9cf9b211030a454a84cbc1cb15b82d9aa49011 Gitweb: http://git.kernel.org/tip/1c9cf9b211030a454a84cbc1cb15b82d9aa49011 Author: Toshi Kani AuthorDate: Thu, 16 Jul 2015 17:23:14 -0600 Committer: Thomas Gleixner CommitDate: Wed, 22 Jul 2015 17:20:33 +0200 x86/mm: Move warning from __ioremap_check_ram() to the call site __ioremap_check_ram() has a WARN_ONCE() which is emitted when the given pfn range is not RAM. The warning is bogus in two aspects: - it never triggers since walk_system_ram_range() only calls __ioremap_check_ram() for RAM ranges. - the warning message is wrong as it says: "ioremap on RAM' after it established that the pfn range is not RAM. Move the WARN_ONCE() to __ioremap_caller(), and update the message to include the address range so we get an actual warning when something tries to ioremap system RAM. [ tglx: Massaged changelog ] Signed-off-by: Toshi Kani Reviewed-by: Dan Williams Cc: Roland Dreier Cc: Luis R. Rodriguez Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1437088996-28511-2-git-send-email-toshi.kani@hp.com Signed-off-by: Thomas Gleixner --- arch/x86/mm/ioremap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index cc5ccc4..fd3df0d 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -63,8 +63,6 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages, !PageReserved(pfn_to_page(start_pfn + i))) return 1; - WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn); - return 0; } @@ -131,8 +129,11 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, pfn = phys_addr >> PAGE_SHIFT; last_pfn = last_addr >> PAGE_SHIFT; if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL, - __ioremap_check_ram) == 1) + __ioremap_check_ram) == 1) { + WARN_ONCE(1, "ioremap on RAM at 0x%llx - 0x%llx\n", + phys_addr, last_addr); return NULL; + } } /* * Mappings have to be page-aligned -- 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/