From ef853394123b2ff71586012d3997f99aae075e40 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Tue, 4 Nov 2008 12:52:44 -0200
Subject: [PATCH] --- yaml --- r: 118539 b: refs/heads/master c:
 8d00450d296dedec9ada38d43b83e79cca6fd5a3 h: refs/heads/master i:   118537:
 ec24f11dc97f91acf2a34c3ab75c75e0945c0729   118535:
 350bf4230b062ee0adae7ec45491a8521364ba6a v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/reboot.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 31df3497e4d5..6a727fb170ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9c3bfc24e1088d260de4091b2b41808c7398355
+refs/heads/master: 8d00450d296dedec9ada38d43b83e79cca6fd5a3
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
index f4c93f1cfc19..724adfc63cb9 100644
--- a/trunk/arch/x86/kernel/reboot.c
+++ b/trunk/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)