---

yaml --- r: 118539 b: refs/heads/master c: 8d00450 h: refs/heads/master i: 118537: ec24f11 118535: 350bf42 v: v3
git-mirror · Nov 6, 2008 · ef85339 · ef85339
1 parent a7f7fe2
commit ef85339
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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)