diff options
| author | Jan Beulich <jbeulich@novell.com> | 2006-01-11 16:47:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:05:04 -0500 |
| commit | 2a2d5924c249e0f73aa00d617f8d5e242ea1430d (patch) | |
| tree | 2458187ff2b5eea03f269e15acf3532f351f8fcb /arch/x86_64/kernel/early_printk.c | |
| parent | 4092bdebab46235d69fcd68afc710cddad550892 (diff) | |
[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>
Diffstat (limited to 'arch/x86_64/kernel/early_printk.c')
| -rw-r--r-- | arch/x86_64/kernel/early_printk.c | 4 |
1 files changed, 1 insertions, 3 deletions
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, ...) | |||
| 216 | va_end(ap); | 216 | va_end(ap); |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | static int keep_early; | 219 | static int __initdata keep_early; |
| 220 | 220 | ||
| 221 | int __init setup_early_printk(char *opt) | 221 | int __init setup_early_printk(char *opt) |
| 222 | { | 222 | { |
| @@ -226,8 +226,6 @@ int __init setup_early_printk(char *opt) | |||
| 226 | if (early_console_initialized) | 226 | if (early_console_initialized) |
| 227 | return -1; | 227 | return -1; |
| 228 | 228 | ||
| 229 | opt = strchr(opt, '=') + 1; | ||
| 230 | |||
| 231 | strlcpy(buf,opt,sizeof(buf)); | 229 | strlcpy(buf,opt,sizeof(buf)); |
| 232 | space = strchr(buf, ' '); | 230 | space = strchr(buf, ' '); |
| 233 | if (space) | 231 | if (space) |