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 17e7b0b..ab50627 100644 (file)
--- 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)