Skip to content

Commit 1b2c92a

Browse files
committed
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 439e175 ("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 0a9567a ("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: 439e175 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>
1 parent 6581ccf commit 1b2c92a

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

include/linux/init.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ void __init init_rootfs(void);
155155

156156
void init_IRQ(void);
157157
void time_init(void);
158-
void mem_encrypt_init(void);
159158
void poking_init(void);
160159
void pgtable_cache_init(void);
161160

0 commit comments

Comments
 (0)