diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-07 10:29:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-07 10:29:58 +0100 |
| commit | 258594a138f4ca9adf214f5272592d7f21def610 (patch) | |
| tree | d97ee71c997b0412f79b9ec4150cb52ce838fe13 /arch/x86/kernel/reboot.c | |
| parent | a87d091434ed2a34d647979ab12084139ee1fe41 (diff) | |
| parent | ca3273f9646694e0419cfb9d6c12deb1c9aff27c (diff) | |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'arch/x86/kernel/reboot.c')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f4c93f1cfc1..724adfc63cb 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -29,11 +29,7 @@ EXPORT_SYMBOL(pm_power_off); static const struct desc_ptr no_idt = {}; static int reboot_mode; -/* - * Keyboard reset and triple fault may result in INIT, not RESET, which - * doesn't work when we're in vmx root mode. Try ACPI first. - */ -enum reboot_type reboot_type = BOOT_ACPI; +enum reboot_type reboot_type = BOOT_KBD; int reboot_force; #if defined(CONFIG_X86_32) && defined(CONFIG_SMP) |