summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/reboot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/kernel/reboot.c')
-rw-r--r--arch/x86_64/kernel/reboot.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index d4c45ff92d5c..3d1cc09406a6 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -109,16 +109,10 @@ void machine_shutdown(void)
local_irq_enable();
}
-void machine_restart(char * __unused)
+void machine_emergency_restart(void)
{
int i;
- printk("machine restart\n");
-
- if (!reboot_force) {
- machine_shutdown();
- }
-
/* Tell the BIOS if we want cold or warm reboot */
*((unsigned short *)__va(0x472)) = reboot_mode;
@@ -143,6 +137,16 @@ void machine_restart(char * __unused)
}
}
+void machine_restart(char * __unused)
+{
+ printk("machine restart\n");
+
+ if (!reboot_force) {
+ machine_shutdown();
+ }
+ machine_emergency_restart();
+}
+
void machine_halt(void)
{
}
OpenPOWER on IntegriCloud