Skip to content

Commit

Permalink
sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function
Browse files Browse the repository at this point in the history
The kdb code should not toggle the sysrq state in case an end user
wants to try and resume the normal kernel execution.

Signed-off-by: Jason Wessel <[email protected]>
Acked-by: Dmitry Torokhov <[email protected]>
  • Loading branch information
jwessel committed Jul 22, 2010
1 parent b0679c6 commit edd63cb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/char/sysrq.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
sysrq_key_table[i] = op_p;
}

static void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
{
struct sysrq_key_op *op_p;
int orig_log_level;
Expand Down
1 change: 1 addition & 0 deletions include/linux/sysrq.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ struct sysrq_key_op {
*/

void handle_sysrq(int key, struct tty_struct *tty);
void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
int register_sysrq_key(int key, struct sysrq_key_op *op);
int unregister_sysrq_key(int key, struct sysrq_key_op *op);
struct sysrq_key_op *__sysrq_get_key_op(int key);
Expand Down
3 changes: 1 addition & 2 deletions kernel/debug/kdb/kdb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1820,9 +1820,8 @@ static int kdb_sr(int argc, const char **argv)
{
if (argc != 1)
return KDB_ARGCOUNT;
sysrq_toggle_support(1);
kdb_trap_printk++;
handle_sysrq(*argv[1], NULL);
__handle_sysrq(*argv[1], NULL, 0);
kdb_trap_printk--;

return 0;
Expand Down

0 comments on commit edd63cb

Please sign in to comment.