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);