From: Greg Kroah-Hartman Date: Sat, 24 Feb 2018 11:17:18 +0000 (+0100) Subject: drop m68k-add-missing-softirqentry_text-linker-section.patch from 3.18 and 4.4 X-Git-Tag: v3.18.96~1 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e17fd6cc8452368e5292573140fc4e79a503ae7b;p=thirdparty%2Fkernel%2Fstable-queue.git drop m68k-add-missing-softirqentry_text-linker-section.patch from 3.18 and 4.4 --- diff --git a/queue-3.18/m68k-add-missing-softirqentry_text-linker-section.patch b/queue-3.18/m68k-add-missing-softirqentry_text-linker-section.patch deleted file mode 100644 index 87ec0970d89..00000000000 --- a/queue-3.18/m68k-add-missing-softirqentry_text-linker-section.patch +++ /dev/null @@ -1,72 +0,0 @@ -From foo@baz Fri Feb 23 12:01:27 CET 2018 -From: Greg Ungerer -Date: Tue, 14 Nov 2017 11:50:07 +1000 -Subject: m68k: add missing SOFTIRQENTRY_TEXT linker section - -From: Greg Ungerer - - -[ Upstream commit 969de0988b77e5a57aac2f7270191a3c50540c52 ] - -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 -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/m68k/kernel/vmlinux-nommu.lds | 2 ++ - arch/m68k/kernel/vmlinux-std.lds | 2 ++ - arch/m68k/kernel/vmlinux-sun3.lds | 2 ++ - 3 files changed, 6 insertions(+) - ---- a/arch/m68k/kernel/vmlinux-nommu.lds -+++ b/arch/m68k/kernel/vmlinux-nommu.lds -@@ -44,6 +44,8 @@ SECTIONS { - .text : { - HEAD_TEXT - TEXT_TEXT -+ IRQENTRY_TEXT -+ SOFTIRQENTRY_TEXT - SCHED_TEXT - LOCK_TEXT - *(.fixup) ---- a/arch/m68k/kernel/vmlinux-std.lds -+++ b/arch/m68k/kernel/vmlinux-std.lds -@@ -15,6 +15,8 @@ SECTIONS - .text : { - HEAD_TEXT - TEXT_TEXT -+ IRQENTRY_TEXT -+ SOFTIRQENTRY_TEXT - SCHED_TEXT - LOCK_TEXT - *(.fixup) ---- a/arch/m68k/kernel/vmlinux-sun3.lds -+++ b/arch/m68k/kernel/vmlinux-sun3.lds -@@ -15,6 +15,8 @@ SECTIONS - .text : { - HEAD_TEXT - TEXT_TEXT -+ IRQENTRY_TEXT -+ SOFTIRQENTRY_TEXT - SCHED_TEXT - LOCK_TEXT - *(.fixup) diff --git a/queue-3.18/series b/queue-3.18/series index caee2edf7a6..eb242aba0c1 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -38,7 +38,6 @@ perf-top-fix-window-dimensions-change-handling.patch perf-bench-numa-fixup-discontiguous-sparse-numa-nodes.patch media-s5k6aa-describe-some-function-parameters.patch scripts-kernel-doc-don-t-fail-with-status-0-if-error-encountered-with-none.patch -m68k-add-missing-softirqentry_text-linker-section.patch powerpc-perf-fix-oops-when-grouping-different-pmu-events.patch s390-dasd-prevent-prefix-i-o-error.patch gianfar-fix-a-flooded-alignment-reports-because-of-padding-issue.patch diff --git a/queue-4.4/m68k-add-missing-softirqentry_text-linker-section.patch b/queue-4.4/m68k-add-missing-softirqentry_text-linker-section.patch deleted file mode 100644 index c9484935c6b..00000000000 --- a/queue-4.4/m68k-add-missing-softirqentry_text-linker-section.patch +++ /dev/null @@ -1,72 +0,0 @@ -From foo@baz Fri Feb 23 11:58:50 CET 2018 -From: Greg Ungerer -Date: Tue, 14 Nov 2017 11:50:07 +1000 -Subject: m68k: add missing SOFTIRQENTRY_TEXT linker section - -From: Greg Ungerer - - -[ Upstream commit 969de0988b77e5a57aac2f7270191a3c50540c52 ] - -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 -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/m68k/kernel/vmlinux-nommu.lds | 2 ++ - arch/m68k/kernel/vmlinux-std.lds | 2 ++ - arch/m68k/kernel/vmlinux-sun3.lds | 2 ++ - 3 files changed, 6 insertions(+) - ---- a/arch/m68k/kernel/vmlinux-nommu.lds -+++ b/arch/m68k/kernel/vmlinux-nommu.lds -@@ -44,6 +44,8 @@ SECTIONS { - .text : { - HEAD_TEXT - TEXT_TEXT -+ IRQENTRY_TEXT -+ SOFTIRQENTRY_TEXT - SCHED_TEXT - LOCK_TEXT - *(.fixup) ---- a/arch/m68k/kernel/vmlinux-std.lds -+++ b/arch/m68k/kernel/vmlinux-std.lds -@@ -15,6 +15,8 @@ SECTIONS - .text : { - HEAD_TEXT - TEXT_TEXT -+ IRQENTRY_TEXT -+ SOFTIRQENTRY_TEXT - SCHED_TEXT - LOCK_TEXT - *(.fixup) ---- a/arch/m68k/kernel/vmlinux-sun3.lds -+++ b/arch/m68k/kernel/vmlinux-sun3.lds -@@ -15,6 +15,8 @@ SECTIONS - .text : { - HEAD_TEXT - TEXT_TEXT -+ IRQENTRY_TEXT -+ SOFTIRQENTRY_TEXT - SCHED_TEXT - LOCK_TEXT - *(.fixup) diff --git a/queue-4.4/series b/queue-4.4/series index f93b2ab50a6..e14923e58ed 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -38,7 +38,6 @@ pinctrl-sunxi-fix-a80-interrupt-pin-bank.patch rdma-cma-make-sure-that-psn-is-not-over-max-allowed.patch scripts-kernel-doc-don-t-fail-with-status-0-if-error-encountered-with-none.patch ipvlan-add-the-skb-mark-as-flow4-s-member-to-lookup-route.patch -m68k-add-missing-softirqentry_text-linker-section.patch powerpc-perf-fix-oops-when-grouping-different-pmu-events.patch s390-dasd-prevent-prefix-i-o-error.patch gianfar-fix-a-flooded-alignment-reports-because-of-padding-issue.patch