x86: drop REBOOT_CF9_COND from reboot fallback chain

Impact: Reverts sequence of reboot fallbacks

Checkin 14d7ca5c575853664d8fe4f225a77b8df1b7de7d changed the default
reboot method to "pci", a.k.a. port CF9.  Unfortunately this has been
shown to cause lockups on at least two systems for which REBOOT_KBD
worked, both Thinkpads with Intel chipsets.  Checkin
3889d0cea2b73049bdca062d9ff1e5d33468289c reverted the default, but did
not revert the fallback chain.  This checkin reverts the fallback
chain; port CF9 is now only done by explicit "reboot=pci" or a future
potential DMI key.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 790b09fbadcbfbffb4938b2ff0cf8a710d3362e7..bb387ab0eea80285e5d5ee2f952eb1f11c2611e7 100644 (file)
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -384,20 +384,20 @@ static void native_machine_emergency_restart(void)
                        load_idt(&no_idt);
                        __asm__ __volatile__("int3");
 
-                       reboot_type = BOOT_CF9_COND;
+                       reboot_type = BOOT_KBD;
                        break;
 
 #ifdef CONFIG_X86_32
                case BOOT_BIOS:
                        machine_real_restart(jump_to_bios, sizeof(jump_to_bios));
 
-                       reboot_type = BOOT_CF9_COND;
+                       reboot_type = BOOT_KBD;
                        break;
 #endif
 
                case BOOT_ACPI:
                        acpi_reboot();
-                       reboot_type = BOOT_CF9_COND;
+                       reboot_type = BOOT_KBD;
                        break;
 
                case BOOT_EFI:
@@ -406,7 +406,7 @@ static void native_machine_emergency_restart(void)
                                                 EFI_RESET_WARM :
                                                 EFI_RESET_COLD,
                                                 EFI_SUCCESS, 0, NULL);
-                       reboot_type = BOOT_CF9_COND;
+                       reboot_type = BOOT_KBD;
                        break;
 
                case BOOT_CF9: