diff --git a/[refs] b/[refs] index 650b095fda8a..c4fca0573bb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47331231bb997a8adb79774fc4cf4bb48fe4e00a +refs/heads/master: 4c30c6f566c0989ddaee3407da44751e340a63ed diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 836a2ae0ac31..28a40d8171b8 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -1604,7 +1604,7 @@ static int __init printk_late_init(void) struct console *con; for_each_console(con) { - if (con->flags & CON_BOOT) { + if (!keep_bootcon && con->flags & CON_BOOT) { printk(KERN_INFO "turn off boot console %s%d\n", con->name, con->index); unregister_console(con);