aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMiguel Boton <mboton.lkml@gmail.com>2008-01-30 07:32:51 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:32:51 -0500
commit4d022e35fd7e07c522c7863fee6f07e53cf3fc14 (patch)
treeaae7e2633bd2808d812df652e00eb3e2ff4745d1 /include
parent71c339116a216b181fc5e203ef51a033fe5e38cf (diff)
x86: reboot_{32|64}.c unification
reboot_{32|64}.c unification patch. This patch unifies the code from the reboot_32.c and reboot_64.c files. It has been tested in computers with X86_32 and X86_64 kernels and it looks like all reboot modes work fine (EFI restart system hasn't been tested yet). Probably I made some mistakes (like I usually do) so I hope we can identify and fix them soon. Signed-off-by: Miguel Boton <mboton@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/emergency-restart.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-x86/emergency-restart.h b/include/asm-x86/emergency-restart.h
index 54189084462a..8e6aef19f8f0 100644
--- a/include/asm-x86/emergency-restart.h
+++ b/include/asm-x86/emergency-restart.h
@@ -4,6 +4,9 @@
4enum reboot_type { 4enum reboot_type {
5 BOOT_TRIPLE = 't', 5 BOOT_TRIPLE = 't',
6 BOOT_KBD = 'k', 6 BOOT_KBD = 'k',
7#ifdef CONFIG_X86_32
8 BOOT_BIOS = 'b',
9#endif
7 BOOT_ACPI = 'a', 10 BOOT_ACPI = 'a',
8 BOOT_EFI = 'e' 11 BOOT_EFI = 'e'
9}; 12};