Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable"

This reverts commit 06c1088, as promised in the warning message.

+2 -6
+2 -6
arch/arm/mm/ioremap.c
··· 204 204 /* 205 205 * Don't allow RAM to be mapped - this causes problems with ARMv6+ 206 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 - } 207 + if (WARN_ON(pfn_valid(pfn))) 208 + return NULL; 213 209 214 210 type = get_mem_type(mtype); 215 211 if (!type)