summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-06-28 12:47:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-06-28 12:47:30 -0700
commit1b2c92a1cb2469d8c0079dbf496ab86e22e1cb7c (patch)
tree19270949f54df0c061e246258712132a72ef7ead
parent6581ccf03e717926be97dc3d27182ce351232f3c (diff)
downloadlinux-1b2c92a1cb2469d8c0079dbf496ab86e22e1cb7c.tar.gz
linux-1b2c92a1cb2469d8c0079dbf496ab86e22e1cb7c.tar.bz2
linux-1b2c92a1cb2469d8c0079dbf496ab86e22e1cb7c.zip
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 <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>
-rw-r--r--include/linux/init.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h
index 1200fa99e848..266c3e1640d4 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);