Why do you remove Robin's printk changes on trunk?
Sonic
________________________________
From: [email protected]
[mailto:[email protected]] On Behalf Of
[email protected]
Sent: Friday, August 14, 2009 2:14 AM
To: [email protected]
Subject: [Linux-kernel-commits] [7180] trunk/kernel/printk.c:
also restoreRobins printk changes on trunk
Revision
7180
<http://blackfin.uclinux.org/gf/project/linux-kernel/scmsvn/?action=brow
se&path=/&view=rev&root=linux-kernel&revision=7180>
Author
vapier <http://blackfin.uclinux.org/gf/user/vapier/>
Date
2009-08-13 14:14:06 -0400 (Thu, 13 Aug 2009)
Log Message
also restore Robins printk changes on trunk
Modified Paths
* trunk/kernel/printk.c
Diff
Modified: trunk/kernel/printk.c (7179 => 7180)
--- trunk/kernel/printk.c 2009-08-13 18:01:17 UTC (rev
7179)
+++ trunk/kernel/printk.c 2009-08-13 18:14:06 UTC (rev
7180)
@@ -1225,6 +1225,23 @@
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);
+ 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
* preferred driver at the head of the list.
@@ -1249,30 +1266,6 @@
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);
- newcon->flags &= ~CON_PRINTBUFFER;
- } else {
- printk(KERN_INFO "%sconsole [%s%d] enabled\n",
- (newcon->flags & CON_BOOT) ? "boot" : ""
,
- newcon->name, newcon->index);
- }
-
}
EXPORT_SYMBOL(register_console);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
