From d5ca076dd58b154ec4ee99eb85b198525b956fe0 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 13 Oct 2010 00:15:25 +0100 Subject: [PATCH] --- yaml --- r: 211482 b: refs/heads/master c: 06c10884486a63a1e4ff657aaa51e848e64b9dc3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/ioremap.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7103b3451f8a..45e1335cbc64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 841f48a849e0dc14fe6f3d2bd31e831ac6a76546 +refs/heads/master: 06c10884486a63a1e4ff657aaa51e848e64b9dc3 diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c index ab506272b2d3..17e7b0b57e49 100644 --- a/trunk/arch/arm/mm/ioremap.c +++ b/trunk/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)