diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-21 10:42:20 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-24 09:49:52 +0000 |
| commit | 67cfa23ac9df810d1fbf3a06b7f408243350ecfe (patch) | |
| tree | 5cec12c5043dc8d4bfc7d62eac0e06f29283a3c4 | |
| parent | dec12e62c03d26bbc7a142f067215a3a43cce7d0 (diff) | |
Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable"
This reverts commit 06c1088, as promised in the warning message.
| -rw-r--r-- | arch/arm/mm/ioremap.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 17e7b0b57e49..ab506272b2d3 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -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) |