diff --git a/[refs] b/[refs] index 3213b2f041b5..e71848e73b8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f048ea81df94f72dee0d42b3d9b941c03b8c9c5 +refs/heads/master: 4de8b9b76017365572f778332d74fe050d9c8c2a diff --git a/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c index 12d563c648f7..feb25158c8ee 100644 --- a/trunk/drivers/char/sysrq.c +++ b/trunk/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 = {