Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3fee609 authored by Petr Mladek's avatar Petr Mladek Committed by Greg Kroah-Hartman
Browse files

sysrq: Remove duplicated sysrq message 



The commit 97f5f0cd ("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: 97f5f0cd ("Input: implement SysRq as a separate input handler")
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 075e1a0c

drivers/tty/sysrq.c

+3 −4
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ void __handle_sysrq(int key, bool check_mask) 
	 */

	orig_log_level = console_loglevel;

	console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;

	pr_info("SysRq : ");



        op_p = __sysrq_get_key_op(key);

        if (op_p) {
@@ -548,15 +547,15 @@ void __handle_sysrq(int key, bool check_mask) 
		 * should not) and is the invoked operation enabled?

		 */

		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;

			op_p->handler(key);

		} else {

			pr_cont("This sysrq operation is disabled.\n");

			pr_info("This sysrq operation is disabled.\n");

			console_loglevel = orig_log_level;

		}

	} else {

		pr_cont("HELP : ");

		pr_info("HELP : ");

		/* Only print the help msg once per handler */

		for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) {

			if (sysrq_key_table[i]) {