diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2023-10-05 10:05:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2023-10-05 10:05:51 +0200 |
| commit | 3fc18b06b8f3408951b5e43548f22984412b0831 (patch) | |
| tree | 5d509acc9a9010aae791cdba9e9f6a02e94b962c /arch/x86/Kconfig | |
| parent | x86: Make IA32_EMULATION boot time configurable (diff) | |
| parent | Linux 6.6-rc4 (diff) | |
| download | linux-3fc18b06b8f3408951b5e43548f22984412b0831.tar.gz linux-3fc18b06b8f3408951b5e43548f22984412b0831.tar.bz2 linux-3fc18b06b8f3408951b5e43548f22984412b0831.zip | |
Merge tag 'v6.6-rc4' into x86/entry, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c130bf3176fe..723fd7afef28 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1945,6 +1945,7 @@ config EFI select UCS2_STRING select EFI_RUNTIME_WRAPPERS select ARCH_USE_MEMREMAP_PROT + select EFI_RUNTIME_MAP if KEXEC_CORE help This enables the kernel to use EFI runtime services that are available (such as the EFI variable services). @@ -2020,7 +2021,6 @@ config EFI_MAX_FAKE_MEM config EFI_RUNTIME_MAP bool "Export EFI runtime maps to sysfs" if EXPERT depends on EFI - default KEXEC_CORE help Export EFI runtime memory regions to /sys/firmware/efi/runtime-map. That memory map is required by the 2nd kernel to set up EFI virtual |