aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-11-23 22:27:55 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-23 22:27:55 +0000
commit932c42b286e2c6479d1cbdee2927cb283b1c0c3b (patch)
treeeeb6ecd92c13755b67dcb3a3d5f94000794632b5
parent5d61b718ec23694a87b2c5c590809c12453a1833 (diff)
downloadmrst-s0i3-test-932c42b286e2c6479d1cbdee2927cb283b1c0c3b.tar.gz
mrst-s0i3-test-932c42b286e2c6479d1cbdee2927cb283b1c0c3b.tar.xz
mrst-s0i3-test-932c42b286e2c6479d1cbdee2927cb283b1c0c3b.zip
ARM: avoid annoying <4>'s in printk output
Adding KERN_WARNING in the middle of strings now produces those tokens in the output, rather than accepting the level as was once the case. Fix this in the one reported case. There might be more... Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/ioremap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 17e7b0b57e4..55c17a6fb22 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -206,8 +206,8 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
*/
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");
+ "to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n"
+ "will fail in the next kernel release. Please fix your driver.\n");
WARN_ON(1);
}