From: Alan Stern Date: Fri, 22 Jun 2012 21:12:19 +0000 (-0400) Subject: printk: fix regression in SYSLOG_ACTION_CLEAR X-Git-Tag: upstream/snapshot3+hdmi~7153^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4661e3568a7d14a93d4e428d246cdb86f4bac6e7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git printk: fix regression in SYSLOG_ACTION_CLEAR Commit 7ff9554bb578ba02166071d2d487b7fc7d860d62 (printk: convert byte-buffer to variable-length record buffer) introduced a regression by accidentally removing a "break" statement from inside the big switch in printk's do_syslog(). The symptom of this bug is that the "dmesg -C" command doesn't only clear the kernel's log buffer; it also disables console logging. This patch (as1561) fixes the regression by adding the missing "break". Signed-off-by: Alan Stern CC: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/printk.c b/kernel/printk.c index a2276b9..d6a1412 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1040,6 +1040,7 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) /* Clear ring buffer */ case SYSLOG_ACTION_CLEAR: syslog_print_all(NULL, 0, true); + break; /* Disable logging to console */ case SYSLOG_ACTION_CONSOLE_OFF: if (saved_console_loglevel == -1)