From 84c21198a5facb031a3742e274131faa97a454ea Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Tue, 15 Apr 2008 00:49:04 -0700
Subject: [PATCH] --- yaml --- r: 88363 b: refs/heads/master c:
 0517deed78be9cc9ce9799bf15da58fd0d2078bb h: refs/heads/master i:   88361:
 924d75e366b54730b9cfb04c675981137a3ea04a   88359:
 604ff5b6ed07fbcf20b4f042e86aebd3991e4af5 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/netconsole.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 777ea6f0a434..ee7d64d10b5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56690c2151d33534f0537fd03c533eda81d96f0f
+refs/heads/master: 0517deed78be9cc9ce9799bf15da58fd0d2078bb
diff --git a/trunk/drivers/net/netconsole.c b/trunk/drivers/net/netconsole.c
index 501e451be911..665341e43055 100644
--- a/trunk/drivers/net/netconsole.c
+++ b/trunk/drivers/net/netconsole.c
@@ -730,7 +730,7 @@ static void write_msg(struct console *con, const char *msg, unsigned int len)
 
 static struct console netconsole = {
 	.name	= "netcon",
-	.flags	= CON_ENABLED | CON_PRINTBUFFER,
+	.flags	= CON_ENABLED,
 	.write	= write_msg,
 };
 
@@ -749,6 +749,9 @@ static int __init init_netconsole(void)
 				err = PTR_ERR(nt);
 				goto fail;
 			}
+			/* Dump existing printks when we register */
+			netconsole.flags |= CON_PRINTBUFFER;
+
 			spin_lock_irqsave(&target_list_lock, flags);
 			list_add(&nt->list, &target_list);
 			spin_unlock_irqrestore(&target_list_lock, flags);