Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit edd63cb6b91024332d6983fc51058ac1ef0c081e

Authored by Jason Wessel
1 parent b0679c63db
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function 

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 <jason.wessel@windriver.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Showing 3 changed files with 3 additions and 3 deletions Side-by-side Diff

drivers/char/sysrq.c
Diff comments   View file @ edd63cb
... ... @@ -493,7 +493,7 @@
493 493 sysrq_key_table[i] = op_p;
494 494 }
495 495  
496   -static void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
  496 +void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
497 497 {
498 498 struct sysrq_key_op *op_p;
499 499 int orig_log_level;
include/linux/sysrq.h
Diff comments   View file @ edd63cb
... ... @@ -45,6 +45,7 @@
45 45 */
46 46  
47 47 void handle_sysrq(int key, struct tty_struct *tty);
  48 +void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
48 49 int register_sysrq_key(int key, struct sysrq_key_op *op);
49 50 int unregister_sysrq_key(int key, struct sysrq_key_op *op);
50 51 struct sysrq_key_op *__sysrq_get_key_op(int key);
kernel/debug/kdb/kdb_main.c
Diff comments   View file @ edd63cb
... ... @@ -1820,9 +1820,8 @@
1820 1820 {
1821 1821 if (argc != 1)
1822 1822 return KDB_ARGCOUNT;
1823   - sysrq_toggle_support(1);
1824 1823 kdb_trap_printk++;
1825   - handle_sysrq(*argv[1], NULL);
  1824 + __handle_sysrq(*argv[1], NULL, 0);
1826 1825 kdb_trap_printk--;
1827 1826  
1828 1827 return 0;