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>

+6 -2
+6 -2
arch/arm/mm/ioremap.c
··· 204 /* 205 * Don't allow RAM to be mapped - this causes problems with ARMv6+ 206 */ 207 - if (WARN_ON(pfn_valid(pfn))) 208 - return NULL; 209 210 type = get_mem_type(mtype); 211 if (!type)
··· 204 /* 205 * Don't allow RAM to be mapped - this causes problems with ARMv6+ 206 */ 207 + if (pfn_valid(pfn)) { 208 + printk(KERN_WARNING "BUG: Your driver calls ioremap() on system memory. This leads\n" 209 + KERN_WARNING "to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n" 210 + KERN_WARNING "will fail in the next kernel release. Please fix your driver.\n"); 211 + WARN_ON(1); 212 + } 213 214 type = get_mem_type(mtype); 215 if (!type)