1 files changed, 16 insertions, 10 deletions

diff --git a/kernel/printk.c b/kernel/printk.c
index 4b47e59248df..c4c5a29a7bed 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -931,8 +931,16 @@ void register_console(struct console *console)
 {
         int i;
         unsigned long flags;
+        struct console *bootconsole = NULL;
 
-        if (preferred_console < 0)
+        if (console_drivers) {
+                if (console->flags & CON_BOOT)
+                        return;
+                if (console_drivers->flags & CON_BOOT)
+                        bootconsole = console_drivers;
+        }
+
+        if (preferred_console < 0 || bootconsole || !console_drivers)
                 preferred_console = selected_console;
 
         /*
@@ -978,8 +986,11 @@ void register_console(struct console *console)
         if (!(console->flags & CON_ENABLED))
                 return;
 
-        if (console_drivers && (console_drivers->flags & CON_BOOT)) {
-                unregister_console(console_drivers);
+        if (bootconsole) {
+                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;
         }
 
@@ -1030,16 +1041,11 @@ int unregister_console(struct console *console)
                 }
         }
 
-        /* If last console is removed, we re-enable picking the first
-         * one that gets registered. Without that, pmac early boot console
-         * would prevent fbcon from taking over.
-         *
+        /*
          * If this isn't the last console and it has CON_CONSDEV set, we
          * need to set it on the next preferred console.
          */
-        if (console_drivers == NULL)
-                preferred_console = selected_console;
-        else if (console->flags & CON_CONSDEV)
+        if (console_drivers != NULL && console->flags & CON_CONSDEV)
                 console_drivers->flags |= CON_CONSDEV;
 
         release_console_sem();