From: Nishanth Aravamudan Date: Thu, 25 Aug 2011 22:59:11 +0000 (-0700) Subject: kernel/printk: do not turn off bootconsole in printk_late_init() if keep_bootcon X-Git-Tag: v3.0.5~239 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f4e15693062aa1afcfc8f05f6790baf29bacfa3;p=karo-tx-linux.git kernel/printk: do not turn off bootconsole in printk_late_init() if keep_bootcon commit 4c30c6f566c0989ddaee3407da44751e340a63ed upstream. It seems that 7bf693951a8e ("console: allow to retain boot console via boot option keep_bootcon") doesn't always achieve what it aims, as when printk_late_init() runs it unconditionally turns off all boot consoles. With this patch, I am able to see more messages on the boot console in KVM guests than I can without, when keep_bootcon is specified. I think it is appropriate for the relevant -stable trees. However, it's more of an annoyance than a serious bug (ideally you don't need to keep the boot console around as console handover should be working -- I was encountering a situation where the console handover wasn't working and not having the boot console available meant I couldn't see why). Signed-off-by: Nishanth Aravamudan Cc: David S. Miller Cc: Alan Cox Cc: Greg KH Acked-by: Fabio M. Di Nitto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/printk.c b/kernel/printk.c index 35185392173f..084982f61dee 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1584,7 +1584,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);