diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-08-01 16:36:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-08 20:03:47 +0200 |
| commit | b0837880fa65fa4a6dc407b42e9b33e18f7b44e3 (patch) | |
| tree | 6c2b940c128f695049ec5266d4a95758fddb68c4 /init | |
| parent | 8183a89caf67a1f56f1da1d6081e26a0ae7a5fdf (diff) | |
| download | linux-stable-b0837880fa65fa4a6dc407b42e9b33e18f7b44e3.tar.gz linux-stable-b0837880fa65fa4a6dc407b42e9b33e18f7b44e3.tar.bz2 linux-stable-b0837880fa65fa4a6dc407b42e9b33e18f7b44e3.zip | |
init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()
commit 439e17576eb47f26b78c5bbc72e344d4206d2327 upstream
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
Signed-off-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/init/main.c b/init/main.c index 3ad2400e7aa4..5b53f04571bb 100644 --- a/init/main.c +++ b/init/main.c @@ -96,7 +96,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> @@ -780,8 +779,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) { } @@ -1083,14 +1080,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) */ locking_selftest(); - /* - * 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. - */ - mem_encrypt_init(); - #ifdef CONFIG_BLK_DEV_INITRD if (initrd_start && !initrd_below_start_ok && page_to_pfn(virt_to_page((void *)initrd_start)) < min_low_pfn) { |