From: Linus Torvalds Date: Wed, 28 Jun 2023 19:47:30 +0000 (-0700) Subject: x86/mem_encrypt: Remove stale mem_encrypt_init() declaration X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1b2c92a1cb2469d8c0079dbf496ab86e22e1cb7c;p=linux.git x86/mem_encrypt: Remove stale mem_encrypt_init() declaration The memory encryption initialization logic was moved from init/main.c into arch_cpu_finalize_init() in commit 439e17576eb4 ("init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()"), but a stale declaration for the init function was left in . And didn't cause any problems if you had X86_MEM_ENCRYPT enabled, which apparently everybody involved did have. See also commit 0a9567ac5e6a ("x86/mem_encrypt: Unbreak the AMD_MEM_ENCRYPT=n build") in this whole sad saga of conflicting declarations for different situations. Reported-by: Matthew Wilcox Fixes: 439e17576eb4 init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init() Cc: Thomas Gleixner Signed-off-by: Linus Torvalds --- diff --git a/include/linux/init.h b/include/linux/init.h index 1200fa99e8482..266c3e1640d47 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -155,7 +155,6 @@ void __init init_rootfs(void); void init_IRQ(void); void time_init(void); -void mem_encrypt_init(void); void poking_init(void); void pgtable_cache_init(void);