Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mm / ioremap.c

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 55c17a6fb22fba2450ebce975a467f6c33ddf0ea..ab506272b2d3ef459b264b7741d61af46f6aa6b8 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"
-                      "to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n"
-                      "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)