Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d37bf60de0b4ddc1633cf278189d3c9bf28fe3d2
Commit:     d37bf60de0b4ddc1633cf278189d3c9bf28fe3d2
Parent:     eaa944afb206f3fc4393630811ee621b866e3255
Author:     Yinghai Lu <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:37:28 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:34 2007 -0700

    console: console handover to preferred console
    
    for earlyprintk=ttyS0,9600 console=tty0 console=ttyS0,9600n8
    
    the handover will happen from earlyser0 to tty0.  but what we want is to
    hand over to ttyS0.
    
    Later with serial-convert-early_uart-to-earlycon-for-8250.patch,
    
        console=tty0 console=uart8250,io,0x3f8,9600n8
    
    will handover to ttyS0 instead of tty0.
    
    Signed-off-by: Yinghai Lu <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Bjorn Helgaas <[EMAIL PROTECTED]>
    Cc: Russell King <[EMAIL PROTECTED]>
    Cc: Gerd Hoffmann <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 kernel/printk.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/kernel/printk.c b/kernel/printk.c
index 4961410..7ce9a8c 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -985,12 +985,15 @@ void register_console(struct console *console)
        if (!(console->flags & CON_ENABLED))
                return;
 
-       if (bootconsole) {
+       if (bootconsole && (console->flags & CON_CONSDEV)) {
                printk(KERN_INFO "console handover: boot [%s%d] -> real 
[%s%d]\n",
                       bootconsole->name, bootconsole->index,
                       console->name, console->index);
                unregister_console(bootconsole);
                console->flags &= ~CON_PRINTBUFFER;
+       } else {
+               printk(KERN_INFO "console [%s%d] enabled\n",
+                      console->name, console->index);
        }
 
        /*
-
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  http://vger.kernel.org/majordomo-info.html

Reply via email to