The following commit has been merged into the core/build branch of tip: Commit-ID: 03c2b85cb7f13e9bd82cbe4201ede52177d433f5 Gitweb: https://git.kernel.org/tip/03c2b85cb7f13e9bd82cbe4201ede52177d433f5 Author: Kees Cook <keescook@xxxxxxxxxxxx> AuthorDate: Fri, 21 Aug 2020 12:42:42 -07:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 01 Sep 2020 09:50:34 +02:00 vmlinux.lds.h: Create COMMON_DISCARDS Collect the common DISCARD sections for architectures that need more specialized discard control than what the standard DISCARDS section provides. Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: linux-arch@xxxxxxxxxxxxxxx Link: https://lore.kernel.org/r/20200821194310.3089815-2-keescook@xxxxxxxxxxxx --- include/asm-generic/vmlinux.lds.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 7616ff0..184b23d 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -954,13 +954,16 @@ EXIT_DATA #endif +#define COMMON_DISCARDS \ + *(.discard) \ + *(.discard.*) \ + *(.modinfo) + #define DISCARDS \ /DISCARD/ : { \ EXIT_DISCARDS \ EXIT_CALL \ - *(.discard) \ - *(.discard.*) \ - *(.modinfo) \ + COMMON_DISCARDS \ } /**
