diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/reboot_64.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c index 53620a92a8f..307f996a393 100644 --- a/arch/x86/kernel/reboot_64.c +++ b/arch/x86/kernel/reboot_64.c @@ -9,6 +9,7 @@ #include <linux/pm.h> #include <linux/kdebug.h> #include <linux/sched.h> +#include <acpi/reboot.h> #include <asm/io.h> #include <asm/delay.h> #include <asm/desc.h> @@ -29,7 +30,8 @@ EXPORT_SYMBOL(pm_power_off); static long no_idt[3]; static enum { BOOT_TRIPLE = 't', - BOOT_KBD = 'k' + BOOT_KBD = 'k', + BOOT_ACPI = 'a' } reboot_type = BOOT_KBD; static int reboot_mode = 0; int reboot_force; @@ -39,6 +41,7 @@ int reboot_force; cold Set the cold reboot flag triple Force a triple fault (init) kbd Use the keyboard controller. cold reset (default) + acpi Use the RESET_REG in the FADT force Avoid anything that could hang. */ static int __init reboot_setup(char *str) @@ -54,6 +57,7 @@ static int __init reboot_setup(char *str) break; case 't': + case 'a': case 'b': case 'k': reboot_type = *str; @@ -146,6 +150,11 @@ void machine_emergency_restart(void) reboot_type = BOOT_KBD; break; + + case BOOT_ACPI: + acpi_reboot(); + reboot_type = BOOT_KBD; + break; } } } |