Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 15:33:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysrq: Remove duplicated sysrq message

Browse Source 
The commit 97f5f0cd8c ("Input: implement SysRq as a separate input
handler") added pr_fmt() definition. It caused a duplicated message
prefix in the sysrq header messages, for example:

[  177.053931] sysrq: SysRq : Show backtrace of all active CPUs
[  742.864776] sysrq: SysRq : HELP : loglevel(0-9) reboot(b) crash(c)

Fixes: 97f5f0cd8c ("Input: implement SysRq as a separate input handler")
Signed-off-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Petr Mladek 2019-01-11 17:20:37 +01:00 committed by Greg Kroah-Hartman
parent 075e1a0c50
commit c3fee60908
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/tty/sysrq.c
View File

@ -539,7 +539,6 @@ void __handle_sysrq(int key, bool check_mask)
*/ */
orig_log_level = console_loglevel; orig_log_level = console_loglevel;
console_loglevel = CONSOLE_LOGLEVEL_DEFAULT; console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
pr_info("SysRq : ");
op_p = __sysrq_get_key_op(key); op_p = __sysrq_get_key_op(key);
if (op_p) { if (op_p) {
@ -548,15 +547,15 @@ void __handle_sysrq(int key, bool check_mask)
* should not) and is the invoked operation enabled? * should not) and is the invoked operation enabled?
*/ */
if (!check_mask || sysrq_on_mask(op_p->enable_mask)) { if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
pr_cont("%s\n", op_p->action_msg); pr_info("%s\n", op_p->action_msg);
console_loglevel = orig_log_level; console_loglevel = orig_log_level;
op_p->handler(key); op_p->handler(key);
} else { } else {
pr_cont("This sysrq operation is disabled.\n"); pr_info("This sysrq operation is disabled.\n");
console_loglevel = orig_log_level; console_loglevel = orig_log_level;
} }
} else { } else {
pr_cont("HELP : "); pr_info("HELP : ");
/* Only print the help msg once per handler */ /* Only print the help msg once per handler */
for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) { for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) {
if (sysrq_key_table[i]) { if (sysrq_key_table[i]) {