Merge branch 'for-linus/hardening' into for-next/hardening

8abfff25 · Kees Cook · 4b21d25b · 000f8870 · 8abfff25
Commit 8abfff25 authored Nov 08, 2022 by Kees Cook
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/asm-generic/vmlinux.lds.h include/asm-generic/vmlinux.lds.h +1 -1

No files found.
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -341,6 +341,7 @@
 #define DATA_DATA							\
 	*(.xiptext)							\
 	*(DATA_MAIN)							\
+	*(.data..decrypted)						\
 	*(.ref.data)							\
 	*(.data..shared_aligned) /* percpu related */			\
 	MEM_KEEP(init.data*)						\
@@ -989,7 +990,6 @@
 #ifdef CONFIG_AMD_MEM_ENCRYPT
 #define PERCPU_DECRYPTED_SECTION					\
 	. = ALIGN(PAGE_SIZE);						\
-	*(.data..decrypted)						\
 	*(.data..percpu..decrypted)					\
 	. = ALIGN(PAGE_SIZE);
 #else