diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/char/sysrq.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 12d563c648f7..feb25158c8ee 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -115,7 +115,7 @@ static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs, | |||
| 115 | struct tty_struct *tty) | 115 | struct tty_struct *tty) |
| 116 | { | 116 | { |
| 117 | local_irq_enable(); | 117 | local_irq_enable(); |
| 118 | machine_restart(NULL); | 118 | emergency_restart(); |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | static struct sysrq_key_op sysrq_reboot_op = { | 121 | static struct sysrq_key_op sysrq_reboot_op = { |