---

yaml --- r: 263334 b: refs/heads/master c: 4c30c6f h: refs/heads/master v: v3
git-mirror · Aug 25, 2011 · 02e798f · 02e798f
1 parent 18f0bf0
commit 02e798f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);