diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 18:58:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 18:58:22 -0700 |
| commit | 56d5e32929ee8e772922242f37cc234c437c89c0 (patch) | |
| tree | 23c07b80fa7c418b4753d7dd1035087f915ba1c3 /init | |
| parent | 72b8944f147e151e845d976e7f48beff38967499 (diff) | |
| parent | 61b57d35396a4b4bcca9944644b24fc6015976b5 (diff) | |
Merge tag 'x86-boot-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar:
- Implement support for embedding EFI SBAT data (Secure Boot Advanced
Targeting: a secure boot image revocation facility) on x86 (Vitaly
Kuznetsov)
- Move the efi_enter_virtual_mode() initialization call from the
generic init code to x86 init code (Alexander Shishkin)
* tag 'x86-boot-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/efi: Implement support for embedding SBAT data for x86
x86/efi: Move runtime service initialization to arch/x86
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c index 225a58279acd..f9f401b6fdfb 100644 --- a/init/main.c +++ b/init/main.c @@ -53,7 +53,6 @@ #include <linux/cpuset.h> #include <linux/memcontrol.h> #include <linux/cgroup.h> -#include <linux/efi.h> #include <linux/tick.h> #include <linux/sched/isolation.h> #include <linux/interrupt.h> @@ -1068,10 +1067,6 @@ void start_kernel(void) pid_idr_init(); anon_vma_init(); -#ifdef CONFIG_X86 - if (efi_enabled(EFI_RUNTIME_SERVICES)) - efi_enter_virtual_mode(); -#endif thread_stack_cache_init(); cred_init(); fork_init(); |