From: Ingo Molnar Date: Tue, 28 Nov 2006 08:14:05 +0000 (+0100) Subject: [PATCH] x86_64: fix 'earlyprintk=...,keep' regression X-Git-Tag: v2.6.19~15 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=24d7bb3396c51ceb2285e0e7b0c1bd1865652c43;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c index e22ecd54870..47b6d90349d 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)) {