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 <[email protected]> --- drivers/char/sysrq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) d7b573e957fb71b166223ee15ea97c93c14f5faa diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -115,7 +115,7 @@ static void sysrq_handle_reboot(int key, struct tty_struct *tty) { local_irq_enable(); - machine_restart(NULL); + emergency_restart(); } static struct sysrq_key_op sysrq_reboot_op = { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 13/23] Fix watchdog drivers to call emergency_reboot()
- From: [email protected] (Eric W. Biederman)
- [PATCH 13/23] Fix watchdog drivers to call emergency_reboot()
- References:
- [PATCH 0/23] reboot-fixes
- From: [email protected] (Eric W. Biederman)
- [PATCH 1/23] Add missing device_suspsend(PMSG_FREEZE) calls.
- From: [email protected] (Eric W. Biederman)
- [PATCH 2/23] Refactor sys_reboot into reusable parts
- From: [email protected] (Eric W. Biederman)
- [PATCH 3/23] Make ctrl_alt_del call kernel_restart to get a proper reboot.
- From: [email protected] (Eric W. Biederman)
- [PATCH 4/23] Add emergency_restart()
- From: [email protected] (Eric W. Biederman)
- [PATCH 5/23] Fix the arguments to machine_restart on cris
- From: [email protected] (Eric W. Biederman)
- [PATCH 6/23] Don't export machine_restart, machine_halt, or machine_power_off.
- From: [email protected] (Eric W. Biederman)
- [PATCH 7/23] i386: Implement machine_emergency_reboot
- From: [email protected] (Eric W. Biederman)
- [PATCH 8/23] x86_64: Fix reboot_force
- From: [email protected] (Eric W. Biederman)
- [PATCH 9/23] x86_64: Implemenent machine_emergency_restart
- From: [email protected] (Eric W. Biederman)
- [PATCH 10/23] Use kernel_power_off in sysrq-o
- From: [email protected] (Eric W. Biederman)
- [PATCH 11/23] Call emergency_reboot from panic
- From: [email protected] (Eric W. Biederman)
- [PATCH 0/23] reboot-fixes
- Prev by Date: [PATCH 15/23] 68328serial: sysrq should use emergency_reboot
- Next by Date: Re: Memory pressure handling with iSCSI
- Previous by thread: [PATCH 11/23] Call emergency_reboot from panic
- Next by thread: [PATCH 13/23] Fix watchdog drivers to call emergency_reboot()
- Index(es):