summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2023-06-14 01:39:41 +0200
committerThomas Gleixner <tglx@linutronix.de>2023-06-16 10:16:00 +0200
commit439e17576eb47f26b78c5bbc72e344d4206d2327 (patch)
tree6164d237ced8cf778a24bd41e9b6150b5add0e98 /init
parent9df9d2f0471b4c4702670380b8d8a45b40b23a7d (diff)
downloadlinux-stable-439e17576eb47f26b78c5bbc72e344d4206d2327.tar.gz
linux-stable-439e17576eb47f26b78c5bbc72e344d4206d2327.tar.bz2
linux-stable-439e17576eb47f26b78c5bbc72e344d4206d2327.zip
init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()
Invoke the X86ism mem_encrypt_init() from X86 arch_cpu_finalize_init() and remove the weak fallback from the core code. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20230613224545.670360645@linutronix.de
Diffstat (limited to 'init')
-rw-r--r--init/main.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/init/main.c b/init/main.c
index c968c198555a..32c65f28d84a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -95,7 +95,6 @@
#include <linux/cache.h>
#include <linux/rodata_test.h>
#include <linux/jump_label.h>
-#include <linux/mem_encrypt.h>
#include <linux/kcsan.h>
#include <linux/init_syscalls.h>
#include <linux/stackdepot.h>
@@ -786,8 +785,6 @@ void __init __weak thread_stack_cache_init(void)
}
#endif
-void __init __weak mem_encrypt_init(void) { }
-
void __init __weak poking_init(void) { }
void __init __weak pgtable_cache_init(void) { }
@@ -1043,16 +1040,6 @@ asmlinkage __visible void __init __no_sanitize_address __noreturn start_kernel(v
arch_cpu_finalize_init();
- /*
- * This needs to be called before any devices perform DMA
- * operations that might use the SWIOTLB bounce buffers. It will
- * mark the bounce buffers as decrypted so that their usage will
- * not cause "plain-text" data to be decrypted when accessed. It
- * must be called after late_time_init() so that Hyper-V x86/x64
- * hypercalls work when the SWIOTLB bounce buffers are decrypted.
- */
- mem_encrypt_init();
-
pid_idr_init();
anon_vma_init();
#ifdef CONFIG_X86