summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/reboot.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-03-05 15:41:15 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2014-03-05 15:41:15 -0800
commitfb3bd7b19b2b6ef779d18573c10c00c53cd8add6 (patch)
tree21ca6d1f56ecf8547cc82e0408c7cf29467c0fe3 /arch/x86/kernel/reboot.c
parenta4f1987e4c5489a3877eaa7451a68d28c5a3f664 (diff)
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>
Diffstat (limited to 'arch/x86/kernel/reboot.c')
-rw-r--r--arch/x86/kernel/reboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index f6012953e0d..654b46574b9 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -535,7 +535,7 @@ static void native_machine_emergency_restart(void)
EFI_RESET_WARM :
EFI_RESET_COLD,
EFI_SUCCESS, 0, NULL);
- reboot_type = BOOT_CF9;
+ reboot_type = BOOT_CF9_COND;
break;
case BOOT_CF9: