[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>

authored by Jan Beulich and committed by Linus Torvalds 2a2d5924 4092bdeb

+3 -5
+1 -1
arch/i386/kernel/setup.c
··· 1584 if (s) { 1585 extern void setup_early_printk(char *); 1586 1587 - setup_early_printk(s); 1588 printk("early console enabled\n"); 1589 } 1590 }
··· 1584 if (s) { 1585 extern void setup_early_printk(char *); 1586 1587 + setup_early_printk(strchr(s, '=') + 1); 1588 printk("early console enabled\n"); 1589 } 1590 }
+1 -3
arch/x86_64/kernel/early_printk.c
··· 216 va_end(ap); 217 } 218 219 - static int keep_early; 220 221 int __init setup_early_printk(char *opt) 222 { ··· 225 226 if (early_console_initialized) 227 return -1; 228 - 229 - opt = strchr(opt, '=') + 1; 230 231 strlcpy(buf,opt,sizeof(buf)); 232 space = strchr(buf, ' ');
··· 216 va_end(ap); 217 } 218 219 + static int __initdata keep_early; 220 221 int __init setup_early_printk(char *opt) 222 { ··· 225 226 if (early_console_initialized) 227 return -1; 228 229 strlcpy(buf,opt,sizeof(buf)); 230 space = strchr(buf, ' ');
+1 -1
arch/x86_64/kernel/head64.c
··· 102 #endif 103 s = strstr(saved_command_line, "earlyprintk="); 104 if (s != NULL) 105 - setup_early_printk(s); 106 #ifdef CONFIG_NUMA 107 s = strstr(saved_command_line, "numa="); 108 if (s != NULL)
··· 102 #endif 103 s = strstr(saved_command_line, "earlyprintk="); 104 if (s != NULL) 105 + setup_early_printk(strchr(s, '=') + 1); 106 #ifdef CONFIG_NUMA 107 s = strstr(saved_command_line, "numa="); 108 if (s != NULL)