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

This reverts commit 06c1088, as promised in the warning message.
This commit is contained in:
Russell King 2010-12-21 10:42:20 +00:00
parent dec12e62c0
commit 67cfa23ac9
1 changed files with 2 additions and 6 deletions

View File

@ -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)