Skip to content

Commit 8abfff2

Browse files
committed
Merge branch 'for-linus/hardening' into for-next/hardening
2 parents 4b21d25 + 000f887 commit 8abfff2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/asm-generic/vmlinux.lds.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@
341341
#define DATA_DATA \
342342
*(.xiptext) \
343343
*(DATA_MAIN) \
344+
*(.data..decrypted) \
344345
*(.ref.data) \
345346
*(.data..shared_aligned) /* percpu related */ \
346347
MEM_KEEP(init.data*) \
@@ -989,7 +990,6 @@
989990
#ifdef CONFIG_AMD_MEM_ENCRYPT
990991
#define PERCPU_DECRYPTED_SECTION \
991992
. = ALIGN(PAGE_SIZE); \
992-
*(.data..decrypted) \
993993
*(.data..percpu..decrypted) \
994994
. = ALIGN(PAGE_SIZE);
995995
#else

0 commit comments

Comments
 (0)