Re: [PATCH] sysrq : restore console_loglevel back to orig_log_level

From: tyeon
Date: Wed May 06 2015 - 22:49:13 EST


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 <tom.yeon@xxxxxxxxxxxxx>
---
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 <tom.yeon@xxxxxxxxxxxxx>
---
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 : ");

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/