diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-21 19:32:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-21 19:32:58 +0100 |
| commit | 6329b1bb4e691b24e51ea940b3c2cffd402bd5f8 (patch) | |
| tree | 1e01171ec074d83637f3249a64c179b2147e8e4b /arch/x86/kernel/reboot.c | |
| parent | 702992387b759828f58e52f660acb284b3069944 (diff) | |
| parent | 14ccee78fc82f5512908f4424f541549a5705b89 (diff) | |
| download | linux-6329b1bb4e691b24e51ea940b3c2cffd402bd5f8.tar.bz2 | |
Merge tag 'v4.13-rc6' into asoc-msm8916
Linux 4.13-rc6
Diffstat (limited to 'arch/x86/kernel/reboot.c')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 67393fc88353..a56bf6051f4e 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -471,12 +471,12 @@ static int __init reboot_init(void) /* * The DMI quirks table takes precedence. If no quirks entry - * matches and the ACPI Hardware Reduced bit is set, force EFI - * reboot. + * matches and the ACPI Hardware Reduced bit is set and EFI + * runtime services are enabled, force EFI reboot. */ rv = dmi_check_system(reboot_dmi_table); - if (!rv && efi_reboot_required()) + if (!rv && efi_reboot_required() && !efi_runtime_disabled()) reboot_type = BOOT_EFI; return 0; |