summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-11-28 09:14:05 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-28 10:58:21 -0800
commit24d7bb3396c51ceb2285e0e7b0c1bd1865652c43 (patch)
tree153814b45772b0d8fdba33ff0f15933bac5b22cd /arch
parent2ea5814472c3c910aed5c5b60f1f3b1000e353f1 (diff)
downloadop-kernel-dev-24d7bb3396c51ceb2285e0e7b0c1bd1865652c43.zip
op-kernel-dev-24d7bb3396c51ceb2285e0e7b0c1bd1865652c43.tar.gz
[PATCH] x86_64: fix 'earlyprintk=...,keep' regression
Commit 2c8c0e6b8d7700a990da8d24eff767f9ca223b96 ("[PATCH] Convert x86-64 to early param") broke the earlyprintk=...,keep feature. This restores that functionality. Tested on x86_64. Must-have for v2.6.19, no risk. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/early_printk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c
index e22ecd5..47b6d903 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
@@ -224,7 +224,7 @@ static int __init setup_early_printk(char *buf)
return 0;
early_console_initialized = 1;
- if (!strcmp(buf,"keep"))
+ if (strstr(buf, "keep"))
keep_early = 1;
if (!strncmp(buf, "serial", 6)) {
OpenPOWER on IntegriCloud