diff options
| author |   Greg Ungerer <gerg@linux-m68k.org> | 2017-11-14 11:50:07 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2017-12-04 10:15:18 +1000 |
| commit | 969de0988b77e5a57aac2f7270191a3c50540c52 (patch) | |
| tree | 9bc9cf408e1b212731a9e5b110a10413d76d21fc /arch/m68k/kernel/vmlinux-std.lds | |
| parent | Linux 4.15-rc2 (diff) | |
| download | linux-dev-969de0988b77e5a57aac2f7270191a3c50540c52.tar.xz linux-dev-969de0988b77e5a57aac2f7270191a3c50540c52.zip | |
m68k: add missing SOFTIRQENTRY_TEXT linker section
Commit be7635e7287e ("arch, ftrace: for KASAN put hard/soft IRQ entries
into separate sections") added a new linker section, SOFTIRQENTRY_TEXT,
to the linker scripts for most architectures. It didn't add it to any of
the linker scripts for the m68k architecture. This was not really a problem
because it is only defined if either of CONFIG_FUNCTION_GRAPH_TRACER or
CONFIG_KASAN are enabled - which can never be true for m68k.
However commit 229a71860547 ("irq: Make the irqentry text section
unconditional") means that SOFTIRQENTRY_TEXT is now always defined. So on
m68k we now end up with a separate ELF section for .softirqentry.text
instead of it being part of the .text section. On some m68k targets in some
configurations this can also cause a fatal link error:
LD vmlinux
/usr/local/bin/../m68k-uclinux/bin/ld.real: section .softirqentry.text loaded at [0000000010de10c0,0000000010de12dd] overlaps section .rodata loaded at [0000000010de10c0,0000000010e0fd67]
To fix add in the missing SOFTIRQENTRY_TEXT section into the m68k linker
scripts. I noticed that m68k is also missing the IRQENTRY_TEXT section,
so this patch also adds an entry for that too.
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel/vmlinux-std.lds')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index 89172b8974b9..625a5785804f 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -16,6 +16,8 @@ SECTIONS .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT |