| From bba722c8261d204e7318e0e990232897c5da398b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 7 Jul 2021 18:07:41 -0700 |
| Subject: hexagon: use common DISCARDS macro |
| |
| From: Nathan Chancellor <nathan@kernel.org> |
| |
| [ Upstream commit 681ba73c72302214686401e707e2087ed11a6556 ] |
| |
| ld.lld warns that the '.modinfo' section is not currently handled: |
| |
| ld.lld: warning: kernel/built-in.a(workqueue.o):(.modinfo) is being placed in '.modinfo' |
| ld.lld: warning: kernel/built-in.a(printk/printk.o):(.modinfo) is being placed in '.modinfo' |
| ld.lld: warning: kernel/built-in.a(irq/spurious.o):(.modinfo) is being placed in '.modinfo' |
| ld.lld: warning: kernel/built-in.a(rcu/update.o):(.modinfo) is being placed in '.modinfo' |
| |
| The '.modinfo' section was added in commit 898490c010b5 ("moduleparam: |
| Save information about built-in modules in separate file") to the DISCARDS |
| macro but Hexagon has never used that macro. The unification of DISCARDS |
| happened in commit 023bf6f1b8bf ("linker script: unify usage of discard |
| definition") in 2009, prior to Hexagon being added in 2011. |
| |
| Switch Hexagon over to the DISCARDS macro so that anything that is |
| expected to be discarded gets discarded. |
| |
| Link: https://lkml.kernel.org/r/20210521011239.1332345-3-nathan@kernel.org |
| Fixes: e95bf452a9e2 ("Hexagon: Add configuration and makefiles for the Hexagon architecture.") |
| Signed-off-by: Nathan Chancellor <nathan@kernel.org> |
| Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> |
| Acked-by: Brian Cain <bcain@codeaurora.org> |
| Cc: David Rientjes <rientjes@google.com> |
| Cc: Oliver Glitta <glittao@gmail.com> |
| Cc: Vlastimil Babka <vbabka@suse.cz> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/hexagon/kernel/vmlinux.lds.S | 7 +------ |
| 1 file changed, 1 insertion(+), 6 deletions(-) |
| |
| diff --git a/arch/hexagon/kernel/vmlinux.lds.S b/arch/hexagon/kernel/vmlinux.lds.S |
| index 20f19539c5fc..57465bff1fe4 100644 |
| --- a/arch/hexagon/kernel/vmlinux.lds.S |
| +++ b/arch/hexagon/kernel/vmlinux.lds.S |
| @@ -61,14 +61,9 @@ SECTIONS |
| |
| _end = .; |
| |
| - /DISCARD/ : { |
| - EXIT_TEXT |
| - EXIT_DATA |
| - EXIT_CALL |
| - } |
| - |
| STABS_DEBUG |
| DWARF_DEBUG |
| ELF_DETAILS |
| |
| + DISCARDS |
| } |
| -- |
| 2.30.2 |
| |