1 files changed, 29 insertions, 15 deletions

diff --git a/kernel/printk.c b/kernel/printk.c
index 41fe60995530..668df351e6a9 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1240,22 +1240,14 @@ void register_console(struct console *newcon)
         if (!(newcon->flags & CON_ENABLED))
                 return;
 
-        if (bcon && ((newcon->flags & (CON_CONSDEV | CON_BOOT)) == CON_CONSDEV)) {
-                /* we need to iterate through twice, to make sure we print
-                 * everything out, before we unregister the console(s)
-                 */
-                printk(KERN_INFO "console handover:");
-                for_each_console(bcon)
-                        printk("boot [%s%d] ", bcon->name, bcon->index);
-                printk(" -> real [%s%d]\n", newcon->name, newcon->index);
-                for_each_console(bcon)
-                        unregister_console(bcon);
+        /*
+         * If we have a bootconsole, and are switching to a real console,
+         * don't print everything out again, since when the boot console, and
+         * the real console are the same physical device, it's annoying to
+         * see the beginning boot messages twice
+         */
+        if (bcon && ((newcon->flags & (CON_CONSDEV | CON_BOOT)) == CON_CONSDEV))
                 newcon->flags &= ~CON_PRINTBUFFER;
-        } else {
-                printk(KERN_INFO "%sconsole [%s%d] enabled\n",
-                        (newcon->flags & CON_BOOT) ? "boot" : "" ,
-                        newcon->name, newcon->index);
-        }
 
         /*
          *      Put this console in the list - keep the
@@ -1281,6 +1273,28 @@ void register_console(struct console *newcon)
                 spin_unlock_irqrestore(&logbuf_lock, flags);
         }
         release_console_sem();
+
+        /*
+         * By unregistering the bootconsoles after we enable the real console
+         * we get the "console xxx enabled" message on all the consoles -
+         * boot consoles, real consoles, etc - this is to ensure that end
+         * users know there might be something in the kernel's log buffer that
+         * went to the bootconsole (that they do not see on the real console)
+         */
+        if (bcon && ((newcon->flags & (CON_CONSDEV | CON_BOOT)) == CON_CONSDEV)) {
+                /* we need to iterate through twice, to make sure we print
+                 * everything out, before we unregister the console(s)
+                 */
+                printk(KERN_INFO "console [%s%d] enabled, bootconsole disabled\n",
+                        newcon->name, newcon->index);
+                for_each_console(bcon)
+                        if (bcon->flags & CON_BOOT)
+                                unregister_console(bcon);
+        } else {
+                printk(KERN_INFO "%sconsole [%s%d] enabled\n",
+                        (newcon->flags & CON_BOOT) ? "boot" : "" ,
+                        newcon->name, newcon->index);
+        }
 }
 EXPORT_SYMBOL(register_console);