From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752381AbbEGCtJ (ORCPT ); Wed, 6 May 2015 22:49:09 -0400 Received: from mail1.windriver.com ([147.11.146.13]:62585 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752348AbbEGCtG (ORCPT ); Wed, 6 May 2015 22:49:06 -0400 Message-ID: <554AD28D.8090102@windriver.com> Date: Thu, 7 May 2015 11:48:45 +0900 From: tyeon User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: "Greg Kroah-Hartman ; Jiri Slaby" CC: "linux-kernel@vger.kernel.org" , Subject: Re: [PATCH] sysrq : restore console_loglevel back to orig_log_level References: <5541D4D1.7020803@windriver.com> <554AD035.4040400@windriver.com> In-Reply-To: <554AD035.4040400@windriver.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org if check_mask is true and sysrq_on_maks returns false, then, the code go through the 'else' statement. if (!check_mask || sysrq_on_maks(..)) { ... } else { pr_cont("This sysrq operation is disabled.\n"); } ... So, console_loglevel remains CONSOLE_LOGLEVEL_DEFAULT Signed-off-by: Tom(JeHyeon) Yeon --- drivers/tty/sysrq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 259a4d5..68d5295 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -537,6 +537,7 @@ void __handle_sysrq(int key, bool check_mask) op_p->handler(key); } else { pr_cont("This sysrq operation is disabled.\n"); + console_loglevel = orig_log_level; } } else { pr_cont("HELP : "); -- 1.7.9.5 sorry to bother you. > if check_mask is true and sysrq_on_maks returns false, > then, the code go through the 'else' statement. > if (!check_mask || sysrq_on_maks(..)) { > ... > } else { > pr_cont("This sysrq operation is disabled.\n"); > } > ... > So, console_loglevel remains CONSOLE_LOGLEVEL_DEFAULT > > Signed-off-by: Tom(JeHyeon) Yeon > --- > drivers/tty/sysrq.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c > index 259a4d5..68d5295 100644 > --- a/drivers/tty/sysrq.c > +++ b/drivers/tty/sysrq.c > @@ -537,6 +537,7 @@ void __handle_sysrq(int key, bool check_mask) > op_p->handler(key); > } else { > pr_cont("This sysrq operation is disabled.\n"); > + console_loglevel = orig_log_level; > } > } else { > pr_cont("HELP : ");