leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jan Beulich 2006-01-11 22:47:03 +01:00 committed by Linus Torvalds
parent 4092bdebab
commit 2a2d5924c2
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/kernel/setup.c
View File

@ -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");
}
}

4
arch/x86_64/kernel/early_printk.c
View File

@ -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)

2
arch/x86_64/kernel/head64.c
View File

@ -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)