diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/sysrq.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 39a05b5fa9cb..0db35857e4d8 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
@@ -121,20 +121,17 @@ static struct sysrq_key_op sysrq_unraw_op = { | |||
121 | #define sysrq_unraw_op (*(struct sysrq_key_op *)0) | 121 | #define sysrq_unraw_op (*(struct sysrq_key_op *)0) |
122 | #endif /* CONFIG_VT */ | 122 | #endif /* CONFIG_VT */ |
123 | 123 | ||
124 | #ifdef CONFIG_KEXEC | 124 | static void sysrq_handle_crash(int key, struct tty_struct *tty) |
125 | static void sysrq_handle_crashdump(int key, struct tty_struct *tty) | ||
126 | { | 125 | { |
127 | crash_kexec(get_irq_regs()); | 126 | char *killer = NULL; |
127 | *killer = 1; | ||
128 | } | 128 | } |
129 | static struct sysrq_key_op sysrq_crashdump_op = { | 129 | static struct sysrq_key_op sysrq_crashdump_op = { |
130 | .handler = sysrq_handle_crashdump, | 130 | .handler = sysrq_handle_crash, |
131 | .help_msg = "Crashdump", | 131 | .help_msg = "Crash", |
132 | .action_msg = "Trigger a crashdump", | 132 | .action_msg = "Trigger a crash", |
133 | .enable_mask = SYSRQ_ENABLE_DUMP, | 133 | .enable_mask = SYSRQ_ENABLE_DUMP, |
134 | }; | 134 | }; |
135 | #else | ||
136 | #define sysrq_crashdump_op (*(struct sysrq_key_op *)0) | ||
137 | #endif | ||
138 | 135 | ||
139 | static void sysrq_handle_reboot(int key, struct tty_struct *tty) | 136 | static void sysrq_handle_reboot(int key, struct tty_struct *tty) |
140 | { | 137 | { |