Commit 8abfff25 authored by Kees Cook's avatar Kees Cook
Browse files

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

parents 4b21d25b 000f8870

include/asm-generic/vmlinux.lds.h

+1 −1
Original line number Diff line number Diff line
@@ -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