diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 19:51:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 23:35:43 +0200 |
| commit | 4de8b9b76017365572f778332d74fe050d9c8c2a (patch) | |
| tree | 17d22eacd721d3ff966f643b92e0243891fcb1a2 /drivers | |
| parent | [PATCH] Call emergency_reboot from panic (diff) | |
| download | linux-4de8b9b76017365572f778332d74fe050d9c8c2a.tar.xz linux-4de8b9b76017365572f778332d74fe050d9c8c2a.zip | |
[PATCH] Update sysrq-B to use emergency_restart()
sysrq calls into the reboot path from an interrupt handler
we can either push the code do into process context and
call kernel_restart and get a clean reboot or we can simply
reboot the machine, and increase our chances of actually
rebooting. emergency_reboot() seems like the closest match
to what we have previously done, and what we want.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -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, struct tty_struct *tty) { local_irq_enable(); - machine_restart(NULL); + emergency_restart(); } static struct sysrq_key_op sysrq_reboot_op = { |