diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 13:50:08 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 13:50:08 -0400 |
| commit | 6de7dc2c4c713d037c19aa1e310d240f16973414 (patch) | |
| tree | 68963db8081e6ef18affd06cf2e9b00578ef874e /drivers/char/sysrq.c | |
| parent | cbc3d65ebcb0c494183d45cf202a53352cbf3871 (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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 = { |