Skip to content

Commit fb3bd7b

Browse files
author
H. Peter Anvin
committed
x86, reboot: Only use CF9_COND automatically, not CF9
Only CF9_COND is appropriate for inclusion in the default chain, not CF9; the latter will poke that register unconditionally, whereas CF9_COND will at least look for PCI configuration method #1 or #2 first (a weak check, but better than nothing.) CF9 should be used for explicit system configuration (command line or DMI) only. Cc: Aubrey Li <aubrey.li@intel.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Link: http://lkml.kernel.org/r/53130A46.1010801@linux.intel.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
1 parent a4f1987 commit fb3bd7b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/x86/kernel/reboot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ static void native_machine_emergency_restart(void)
535535
EFI_RESET_WARM :
536536
EFI_RESET_COLD,
537537
EFI_SUCCESS, 0, NULL);
538-
reboot_type = BOOT_CF9;
538+
reboot_type = BOOT_CF9_COND;
539539
break;
540540

541541
case BOOT_CF9:

0 commit comments

Comments
 (0)