aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@google.com>2008-01-30 13:31:17 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:31:17 +0100
commitfa20efd2fcd9349770113c6f72fc76ce437b62f5 (patch)
tree15600837350257043966fe7b8d8cf0d1d8badd00 /Documentation
parent5f561d3be8f0db54f9b4fc5cb5db05343f372431 (diff)
downloadkernel_samsung_aries-fa20efd2fcd9349770113c6f72fc76ce437b62f5.zip
kernel_samsung_aries-fa20efd2fcd9349770113c6f72fc76ce437b62f5.tar.gz
kernel_samsung_aries-fa20efd2fcd9349770113c6f72fc76ce437b62f5.tar.bz2
x86: add ACPI reboot option
Add the ability to reboot an x86_64 based machine using the RESET_REG in the FADT ACPI table. Signed-off-by: Aaron Durbin <adurbin@google.com> Cc: Len Brown <lenb@kernel.org> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/x86_64/boot-options.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 9453118..d7a3332 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -110,12 +110,15 @@ Idle loop
Rebooting
- reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old]
+ reboot=b[ios] | t[riple] | k[bd] | a[cpi] [, [w]arm | [c]old]
bios Use the CPU reboot vector for warm reset
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)
+ 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.
Using warm reset will be much faster especially on big memory
systems because the BIOS will not go through the memory check.