commit 24d7bb3396c51ceb2285e0e7b0c1bd1865652c43
tree 153814b45772b0d8fdba33ff0f15933bac5b22cd
parent 2ea5814472c3c910aed5c5b60f1f3b1000e353f1
author Ingo Molnar <[EMAIL PROTECTED]> 1164701645 +0100
committer Linus Torvalds <[EMAIL PROTECTED]> 1164740301 -0800

[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 <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 arch/x86_64/kernel/early_printk.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86_64/kernel/early_printk.c 
index e22ecd5..47b6d90 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(cha
                return 0;
        early_console_initialized = 1;
-       if (!strcmp(buf,"keep"))
+       if (strstr(buf, "keep"))
                keep_early = 1;
        if (!strncmp(buf, "serial", 6)) {
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to