diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
| commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
| tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /drivers/char/sysrq.c | |
| parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
| parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
| download | kernel_replicant_linux-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.gz kernel_replicant_linux-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.bz2 kernel_replicant_linux-2e6713c7662cc5ebc7346b033c404cb2f708fd51.zip | |
Merge branch 'master' into for-linus
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 @@ #include <linux/spinlock.h> #include <linux/vt_kern.h> #include <linux/workqueue.h> -#include <linux/kexec.h> #include <linux/hrtimer.h> #include <linux/oom.h> @@ -124,9 +123,12 @@ static struct sysrq_key_op sysrq_unraw_op = { static void sysrq_handle_crash(int key, struct tty_struct *tty) { char *killer = NULL; + + panic_on_oops = 1; /* force panic */ + wmb(); *killer = 1; } -static struct sysrq_key_op sysrq_crashdump_op = { +static struct sysrq_key_op sysrq_crash_op = { .handler = sysrq_handle_crash, .help_msg = "Crash", .action_msg = "Trigger a crash", @@ -401,7 +403,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { */ NULL, /* a */ &sysrq_reboot_op, /* b */ - &sysrq_crashdump_op, /* c & ibm_emac driver debug */ + &sysrq_crash_op, /* c & ibm_emac driver debug */ &sysrq_showlocks_op, /* d */ &sysrq_term_op, /* e */ &sysrq_moom_op, /* f */ |