aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-13 00:15:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-13 00:19:03 +0100
commit06c10884486a63a1e4ff657aaa51e848e64b9dc3 (patch)
tree3913f3d19b60a9e6a62484e2f4e352d9dcf995a8
parent841f48a849e0dc14fe6f3d2bd31e831ac6a76546 (diff)
downloadmrst-s0i3-test-06c10884486a63a1e4ff657aaa51e848e64b9dc3.tar.gz
mrst-s0i3-test-06c10884486a63a1e4ff657aaa51e848e64b9dc3.tar.xz
mrst-s0i3-test-06c10884486a63a1e4ff657aaa51e848e64b9dc3.zip
ARM: relax ioremap prohibition (309caa9) for -final and -stable
... but produce a big warning about the problem as encouragement for people to fix their drivers. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/ioremap.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index ab506272b2d..17e7b0b57e4 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -204,8 +204,12 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
/*
* Don't allow RAM to be mapped - this causes problems with ARMv6+
*/
- if (WARN_ON(pfn_valid(pfn)))
- return NULL;
+ 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);
+ }
type = get_mem_type(mtype);
if (!type)