From 43ec15a2f16bb86a237cf47885a8cee8558cfdfd Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 22 Jun 2012 17:12:19 -0400 Subject: [PATCH] --- yaml --- r: 311506 b: refs/heads/master c: 4661e3568a7d14a93d4e428d246cdb86f4bac6e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a7f63856885f..4e5913d11e55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb3979f64d25120d60b9e761a4c58f70b1a02f86 +refs/heads/master: 4661e3568a7d14a93d4e428d246cdb86f4bac6e7 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index a2276b916769..d6a1412f6b09 100644 --- a/trunk/kernel/printk.c +++ b/trunk/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)