diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-03-15 09:00:28 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-03-15 09:01:07 +0300 |
| commit | 9bd1e03005e74ecfe16f58143714f25793ae1c5d (patch) | |
| tree | 557f67e781effd12a2fdf1816b757c61be8d832e /arch/x86/kernel/kexec-bzimage64.c | |
| parent | 7859d04be772a1d185de335a8e9d38ac03a89f3f (diff) | |
| parent | ce194fa2b267e2018f42442347d90df01c4071d6 (diff) | |
| download | linux-dev-4.19.tar.xz | |
Merge tag 'v4.19.29' into dev-4.19dev-4.19
This is the 4.19.29 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/x86/kernel/kexec-bzimage64.c')
| -rw-r--r-- | arch/x86/kernel/kexec-bzimage64.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index 278cd07228dd..9490a2845f14 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -167,6 +167,9 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr, struct efi_info *current_ei = &boot_params.efi_info; struct efi_info *ei = ¶ms->efi_info; + if (!efi_enabled(EFI_RUNTIME_SERVICES)) + return 0; + if (!current_ei->efi_memmap_size) return 0; |