x86/mem_encrypt: Remove stale mem_encrypt_init() declaration
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Jun 2023 19:47:30 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Jun 2023 19:47:30 +0000 (12:47 -0700)
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 <linux/init.h>.

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 <willy@infradead.org>
Fixes: 439e17576eb4 init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/init.h

index 1200fa99e8482f5b8123a40ff0e36a9b512e3b74..266c3e1640d47a028c013bfe64fbacbb36c2e534 100644 (file)
@@ -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);