From 2251a342d8441025843ecbfacd4aca861d7dfe8b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 15 Apr 2008 19:15:00 -0700
Subject: [PATCH] --- yaml --- r: 88375 b: refs/heads/master c:
 c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd h: refs/heads/master i:   88373:
 88c9786a1f6a6dc0cdc62f816a5a87de4dda24c2   88371:
 b4f3d93e6eb5168390e930c999701add8272b29c   88367:
 e2dc2999a56f47521c0a1aacf1f1ae696baa056e v: v3

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

diff --git a/[refs] b/[refs]
index b467118cc6aa..15e14f2c8c56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b358492cd2a9c67bff352c5a60d86e7fc9627477
+refs/heads/master: c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd
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);