From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 21 Dec 2010 10:42:20 +0000 (+0000)
Subject: Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable"
X-Git-Tag: v2.6.38-rc1~471^2~2^2~4
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=67cfa23ac9df810d1fbf3a06b7f408243350ecfe;p=cascardo%2Flinux.git

Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable"

This reverts commit 06c1088, as promised in the warning message.
---

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 17e7b0b57e49..ab506272b2d3 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -204,12 +204,8 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
 	/*
 	 * Don't allow RAM to be mapped - this causes problems with ARMv6+
 	 */
-	if (pfn_valid(pfn)) {
-		printk(KERN_WARNING "BUG: Your driver calls ioremap() on system memory.  This leads\n"
-		       KERN_WARNING "to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n"
-		       KERN_WARNING "will fail in the next kernel release.  Please fix your driver.\n");
-		WARN_ON(1);
-	}
+	if (WARN_ON(pfn_valid(pfn)))
+		return NULL;
 
 	type = get_mem_type(mtype);
 	if (!type)