diff options
Diffstat (limited to 'drivers/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 0db35857e4d8..5d7a02f63e1c 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/vt_kern.h> | 36 | #include <linux/vt_kern.h> |
| 37 | #include <linux/workqueue.h> | 37 | #include <linux/workqueue.h> |
| 38 | #include <linux/kexec.h> | ||
| 39 | #include <linux/hrtimer.h> | 38 | #include <linux/hrtimer.h> |
| 40 | #include <linux/oom.h> | 39 | #include <linux/oom.h> |
| 41 | 40 | ||
| @@ -124,9 +123,12 @@ static struct sysrq_key_op sysrq_unraw_op = { | |||
| 124 | static void sysrq_handle_crash(int key, struct tty_struct *tty) | 123 | static void sysrq_handle_crash(int key, struct tty_struct *tty) |
| 125 | { | 124 | { |
| 126 | char *killer = NULL; | 125 | char *killer = NULL; |
| 126 | |||
| 127 | panic_on_oops = 1; /* force panic */ | ||
| 128 | wmb(); | ||
| 127 | *killer = 1; | 129 | *killer = 1; |
| 128 | } | 130 | } |
| 129 | static struct sysrq_key_op sysrq_crashdump_op = { | 131 | static struct sysrq_key_op sysrq_crash_op = { |
| 130 | .handler = sysrq_handle_crash, | 132 | .handler = sysrq_handle_crash, |
| 131 | .help_msg = "Crash", | 133 | .help_msg = "Crash", |
| 132 | .action_msg = "Trigger a crash", | 134 | .action_msg = "Trigger a crash", |
| @@ -401,7 +403,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { | |||
| 401 | */ | 403 | */ |
| 402 | NULL, /* a */ | 404 | NULL, /* a */ |
| 403 | &sysrq_reboot_op, /* b */ | 405 | &sysrq_reboot_op, /* b */ |
| 404 | &sysrq_crashdump_op, /* c & ibm_emac driver debug */ | 406 | &sysrq_crash_op, /* c & ibm_emac driver debug */ |
| 405 | &sysrq_showlocks_op, /* d */ | 407 | &sysrq_showlocks_op, /* d */ |
| 406 | &sysrq_term_op, /* e */ | 408 | &sysrq_term_op, /* e */ |
| 407 | &sysrq_moom_op, /* f */ | 409 | &sysrq_moom_op, /* f */ |
