Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67cfa23a authored by Russell King's avatar Russell King
Browse files

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

This reverts commit 06c10884, as promised in the warning message.
parent dec12e62

arch/arm/mm/ioremap.c

+2 −6
Original line number Diff line number Diff line
@@ -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)