diff options
Diffstat (limited to 'arch/i386/kernel/reboot.c')
-rw-r--r-- | arch/i386/kernel/reboot.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 1b24bc7271af..d473350aa055 100644 --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c | |||
@@ -311,10 +311,8 @@ void machine_shutdown(void) | |||
311 | #endif | 311 | #endif |
312 | } | 312 | } |
313 | 313 | ||
314 | void machine_restart(char * __unused) | 314 | void machine_emergency_restart(void) |
315 | { | 315 | { |
316 | machine_shutdown(); | ||
317 | |||
318 | if (!reboot_thru_bios) { | 316 | if (!reboot_thru_bios) { |
319 | if (efi_enabled) { | 317 | if (efi_enabled) { |
320 | efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL); | 318 | efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL); |
@@ -337,6 +335,12 @@ void machine_restart(char * __unused) | |||
337 | machine_real_restart(jump_to_bios, sizeof(jump_to_bios)); | 335 | machine_real_restart(jump_to_bios, sizeof(jump_to_bios)); |
338 | } | 336 | } |
339 | 337 | ||
338 | void machine_restart(char * __unused) | ||
339 | { | ||
340 | machine_shutdown(); | ||
341 | machine_emergency_restart(); | ||
342 | } | ||
343 | |||
340 | void machine_halt(void) | 344 | void machine_halt(void) |
341 | { | 345 | { |
342 | } | 346 | } |