Make ACPI be the default reset method for x86_64. If the reset mechanism fails
using ACPI, it will default to using the keyboard controller.
Signed-off-by: Aaron Durbin <[email protected]>
---
This patch relies on the ACPI reboot mechanism patch.
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index a9253bc..1a9419c 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -113,10 +113,10 @@ Rebooting
warm Don't set the cold reboot flag
cold Set the cold reboot flag
triple Force a triple fault (init)
- kbd Use the keyboard controller. cold reset (default)
+ kbd Use the keyboard controller. cold reset
acpi Use the ACPI RESET_REG in the FADT. If ACPI is not configured or the
ACPI reset does not work, the reboot path attempts the reset using
- the keyboard controller.
+ the keyboard controller. (default)
Using warm reset will be much faster especially on big memory
systems because the BIOS will not go through the memory check.
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 239b576..6fc1b72 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -29,7 +29,7 @@ static enum {
BOOT_TRIPLE = 't',
BOOT_KBD = 'k',
BOOT_ACPI = 'a'
-} reboot_type = BOOT_KBD;
+} reboot_type = BOOT_ACPI;
static int reboot_mode = 0;
int reboot_force;
-
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/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
