[PATCH] i386/x86-64: make setup_early_printk() usage consistent

The explicit and implicit calls to setup_early_printk() were passing
inconsistent arguments.

Signed-Off-By: Jan Beulich <jbeulich@novell.com>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 3 insertions, 5 deletions

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index a720f743ea6e..51e513b4f72d 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1584,7 +1584,7 @@ void __init setup_arch(char **cmdline_p)
                 if (s) {
                         extern void setup_early_printk(char *);
 
-                        setup_early_printk(s);
+                        setup_early_printk(strchr(s, '=') + 1);
                         printk("early console enabled\n");
                 }
         }
diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c
index 9cd968dd0f5a..6dffb498ccd7 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
@@ -216,7 +216,7 @@ void early_printk(const char *fmt, ...)
         va_end(ap); 
 } 
 
-static int keep_early; 
+static int __initdata keep_early;
 
 int __init setup_early_printk(char *opt) 
 {  
@@ -226,8 +226,6 @@ int __init setup_early_printk(char *opt)
         if (early_console_initialized)
                 return -1;
 
-        opt = strchr(opt, '=') + 1;
-
         strlcpy(buf,opt,sizeof(buf)); 
         space = strchr(buf, ' '); 
         if (space)
diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 2ea42ceb08f3..cea20a66c150 100644
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -102,7 +102,7 @@ void __init x86_64_start_kernel(char * real_mode_data)
 #endif
         s = strstr(saved_command_line, "earlyprintk=");
         if (s != NULL)
-                setup_early_printk(s);
+                setup_early_printk(strchr(s, '=') + 1);
 #ifdef CONFIG_NUMA
         s = strstr(saved_command_line, "numa=");
         if (s != NULL)