Skip to content

Commit

Permalink
Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable"
Browse files Browse the repository at this point in the history
This reverts commit 06c1088, as promised in the warning message.
  • Loading branch information
Russell King committed Dec 24, 2010
1 parent dec12e6 commit 67cfa23
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions arch/arm/mm/ioremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 67cfa23

Please sign in to comment.