From dfb798fecb9df7edb0b8c6d3c0ac4cc283b07ea8 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 21 Dec 2010 10:42:20 +0000 Subject: [PATCH] --- yaml --- r: 225861 b: refs/heads/master c: 67cfa23ac9df810d1fbf3a06b7f408243350ecfe h: refs/heads/master i: 225859: a45cede2375529b1b630dc76dddfbe7e864777a7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/ioremap.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a07461a7fc54..fc3f5262ebdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dec12e62c03d26bbc7a142f067215a3a43cce7d0 +refs/heads/master: 67cfa23ac9df810d1fbf3a06b7f408243350ecfe diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c index 17e7b0b57e49..ab506272b2d3 100644 --- a/trunk/arch/arm/mm/ioremap.c +++ b/trunk/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)