From: Greg Kroah-Hartman Date: Fri, 19 Oct 2018 09:15:33 +0000 (+0200) Subject: drop riscv patch that isn't needed on older kernels. X-Git-Tag: v4.18.16~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72296e5cc7da1612204429e63594db08666e1ca3;p=thirdparty%2Fkernel%2Fstable-queue.git drop riscv patch that isn't needed on older kernels. --- diff --git a/queue-3.18/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch b/queue-3.18/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch deleted file mode 100644 index 99adc2a04e7..00000000000 --- a/queue-3.18/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Thu Oct 18 11:14:02 CEST 2018 -From: James Cowgill -Date: Thu, 6 Sep 2018 22:57:56 +0100 -Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h - -From: James Cowgill - -[ Upstream commit 57a489786de9ec37d6e25ef1305dc337047f0236 ] - -Building a riscv kernel with CONFIG_FUNCTION_TRACER and -CONFIG_MODVERSIONS enabled results in these two warnings: - - MODPOST vmlinux.o -WARNING: EXPORT symbol "return_to_handler" [vmlinux] version generation failed, symbol will not be versioned. -WARNING: EXPORT symbol "_mcount" [vmlinux] version generation failed, symbol will not be versioned. - -When exporting symbols from an assembly file, the MODVERSIONS code -requires their prototypes to be defined in asm-prototypes.h (see -scripts/Makefile.build). Since both of these symbols have prototypes -defined in linux/ftrace.h, include this header from RISC-V's -asm-prototypes.h. - -Reported-by: Karsten Merker -Signed-off-by: James Cowgill -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/asm-prototypes.h | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 arch/riscv/include/asm/asm-prototypes.h - ---- /dev/null -+++ b/arch/riscv/include/asm/asm-prototypes.h -@@ -0,0 +1,7 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+#ifndef _ASM_RISCV_PROTOTYPES_H -+ -+#include -+#include -+ -+#endif /* _ASM_RISCV_PROTOTYPES_H */ diff --git a/queue-3.18/series b/queue-3.18/series index d20cfef0e0e..a7165524935 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -15,6 +15,5 @@ net-systemport-fix-wake-up-interrupt-race-during-resume.patch rtnl-limit-ifla_num_tx_queues-and-ifla_num_rx_queues-to-4096.patch ip6_tunnel-be-careful-when-accessing-the-inner-header.patch media-af9035-prevent-buffer-overflow-on-write.patch -risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch powerpc-tm-fix-userspace-r13-corruption.patch powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch diff --git a/queue-4.14/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch b/queue-4.14/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch deleted file mode 100644 index 100b923bfe7..00000000000 --- a/queue-4.14/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Thu Oct 18 11:10:09 CEST 2018 -From: James Cowgill -Date: Thu, 6 Sep 2018 22:57:56 +0100 -Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h - -From: James Cowgill - -[ Upstream commit 57a489786de9ec37d6e25ef1305dc337047f0236 ] - -Building a riscv kernel with CONFIG_FUNCTION_TRACER and -CONFIG_MODVERSIONS enabled results in these two warnings: - - MODPOST vmlinux.o -WARNING: EXPORT symbol "return_to_handler" [vmlinux] version generation failed, symbol will not be versioned. -WARNING: EXPORT symbol "_mcount" [vmlinux] version generation failed, symbol will not be versioned. - -When exporting symbols from an assembly file, the MODVERSIONS code -requires their prototypes to be defined in asm-prototypes.h (see -scripts/Makefile.build). Since both of these symbols have prototypes -defined in linux/ftrace.h, include this header from RISC-V's -asm-prototypes.h. - -Reported-by: Karsten Merker -Signed-off-by: James Cowgill -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/asm-prototypes.h | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 arch/riscv/include/asm/asm-prototypes.h - ---- /dev/null -+++ b/arch/riscv/include/asm/asm-prototypes.h -@@ -0,0 +1,7 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+#ifndef _ASM_RISCV_PROTOTYPES_H -+ -+#include -+#include -+ -+#endif /* _ASM_RISCV_PROTOTYPES_H */ diff --git a/queue-4.14/series b/queue-4.14/series index 90643a7a47c..e5972170dc8 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -23,7 +23,6 @@ scsi-ipr-system-hung-while-dlpar-adding-primary-ipr-adapter-back.patch scsi-sd-don-t-crash-the-host-on-invalid-commands.patch net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch clocksource-drivers-fttmr010-fix-set_next_event-handler.patch -risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch powerpc-tm-fix-userspace-r13-corruption.patch powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch diff --git a/queue-4.4/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch b/queue-4.4/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch deleted file mode 100644 index fbf03529680..00000000000 --- a/queue-4.4/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Thu Oct 18 11:12:46 CEST 2018 -From: James Cowgill -Date: Thu, 6 Sep 2018 22:57:56 +0100 -Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h - -From: James Cowgill - -[ Upstream commit 57a489786de9ec37d6e25ef1305dc337047f0236 ] - -Building a riscv kernel with CONFIG_FUNCTION_TRACER and -CONFIG_MODVERSIONS enabled results in these two warnings: - - MODPOST vmlinux.o -WARNING: EXPORT symbol "return_to_handler" [vmlinux] version generation failed, symbol will not be versioned. -WARNING: EXPORT symbol "_mcount" [vmlinux] version generation failed, symbol will not be versioned. - -When exporting symbols from an assembly file, the MODVERSIONS code -requires their prototypes to be defined in asm-prototypes.h (see -scripts/Makefile.build). Since both of these symbols have prototypes -defined in linux/ftrace.h, include this header from RISC-V's -asm-prototypes.h. - -Reported-by: Karsten Merker -Signed-off-by: James Cowgill -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/asm-prototypes.h | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 arch/riscv/include/asm/asm-prototypes.h - ---- /dev/null -+++ b/arch/riscv/include/asm/asm-prototypes.h -@@ -0,0 +1,7 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+#ifndef _ASM_RISCV_PROTOTYPES_H -+ -+#include -+#include -+ -+#endif /* _ASM_RISCV_PROTOTYPES_H */ diff --git a/queue-4.4/series b/queue-4.4/series index f71f62b7c63..646b4891811 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -37,7 +37,6 @@ clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-so input-atakbd-fix-atari-keymap.patch input-atakbd-fix-atari-capslock-behaviour.patch net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch -risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch powerpc-tm-fix-userspace-r13-corruption.patch powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch arc-build-get-rid-of-toolchain-check.patch diff --git a/queue-4.9/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch b/queue-4.9/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch deleted file mode 100644 index bc321e62ffb..00000000000 --- a/queue-4.9/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Thu Oct 18 11:11:32 CEST 2018 -From: James Cowgill -Date: Thu, 6 Sep 2018 22:57:56 +0100 -Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h - -From: James Cowgill - -[ Upstream commit 57a489786de9ec37d6e25ef1305dc337047f0236 ] - -Building a riscv kernel with CONFIG_FUNCTION_TRACER and -CONFIG_MODVERSIONS enabled results in these two warnings: - - MODPOST vmlinux.o -WARNING: EXPORT symbol "return_to_handler" [vmlinux] version generation failed, symbol will not be versioned. -WARNING: EXPORT symbol "_mcount" [vmlinux] version generation failed, symbol will not be versioned. - -When exporting symbols from an assembly file, the MODVERSIONS code -requires their prototypes to be defined in asm-prototypes.h (see -scripts/Makefile.build). Since both of these symbols have prototypes -defined in linux/ftrace.h, include this header from RISC-V's -asm-prototypes.h. - -Reported-by: Karsten Merker -Signed-off-by: James Cowgill -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/asm-prototypes.h | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 arch/riscv/include/asm/asm-prototypes.h - ---- /dev/null -+++ b/arch/riscv/include/asm/asm-prototypes.h -@@ -0,0 +1,7 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+#ifndef _ASM_RISCV_PROTOTYPES_H -+ -+#include -+#include -+ -+#endif /* _ASM_RISCV_PROTOTYPES_H */ diff --git a/queue-4.9/series b/queue-4.9/series index f8416299fda..3009e483db7 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -16,7 +16,6 @@ ravb-do-not-write-1-to-reserved-bits.patch drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch scsi-sd-don-t-crash-the-host-on-invalid-commands.patch net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch -risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch powerpc-tm-fix-userspace-r13-corruption.patch powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch