Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b802394 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

printk: report console names during cut-over 



This reports the names of consoles as they're being disabled to help
identify which is which during cut-over.  Helps answer the question
"which boot console actually got activated?" once the regular console is
running, mostly when debugging boot console failures.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Joe Perches <joe@perches.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8f6b2ae4

kernel/printk/printk.c

+9 −10
Original line number Diff line number Diff line
@@ -2358,21 +2358,18 @@ void register_console(struct console *newcon) 
	 * 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)

	 */

	printk(KERN_INFO "%sconsole [%s%d] enabled\n",

		(newcon->flags & CON_BOOT) ? "boot" : "" ,

		newcon->name, newcon->index);

	if (bcon &&

	    ((newcon->flags & (CON_CONSDEV | CON_BOOT)) == CON_CONSDEV) &&

	    !keep_bootcon) {

		/* we need to iterate through twice, to make sure we print

		 * everything out, before we unregister the console(s)

		/* We need to iterate through all boot consoles, to make

		 * sure we print everything out, before we unregister them.

		 */

		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);
@@ -2382,6 +2379,10 @@ int unregister_console(struct console *console) 
        struct console *a, *b;

	int res;



	printk(KERN_INFO "%sconsole [%s%d] disabled\n",

		(console->flags & CON_BOOT) ? "boot" : "" ,

		console->name, console->index);



	res = _braille_unregister_console(console);

	if (res)

		return res;
@@ -2421,8 +2422,6 @@ static int __init printk_late_init(void) 


	for_each_console(con) {

		if (!keep_bootcon && con->flags & CON_BOOT) {

			printk(KERN_INFO "turn off boot console %s%d\n",

				con->name, con->index);

			unregister_console(con);

		}

	}