From 75e34cb132293510839d8667b661e65848fc2bba Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 31 Mar 2009 08:25:54 +0900
Subject: [PATCH] --- yaml --- r: 141812 b: refs/heads/master c:
 0bd4781d40ffc3bff939a2540041144b99c373b8 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/kernel/setup.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f9742d1362ea..ae4745b9570b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47131258765e3561475822a7838b7ed90e2f6990
+refs/heads/master: 0bd4781d40ffc3bff939a2540041144b99c373b8
diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c
index 24c60251f680..04a6004fccc4 100644
--- a/trunk/arch/sh/kernel/setup.c
+++ b/trunk/arch/sh/kernel/setup.c
@@ -103,12 +103,11 @@ static int __init early_parse_mem(char *p)
 	size = memparse(p, &p);
 
 	if (size > __MEMORY_SIZE) {
-		static char msg[] __initdata = KERN_ERR
+		printk(KERN_ERR
 			"Using mem= to increase the size of kernel memory "
 			"is not allowed.\n"
 			"  Recompile the kernel with the correct value for "
-			"CONFIG_MEMORY_SIZE.\n";
-		printk(msg);
+			"CONFIG_MEMORY_SIZE.\n");
 		return 0;
 	}