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 (file)
index 99adc2a..0000000
--- 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 <jcowgill@debian.org>
-Date: Thu, 6 Sep 2018 22:57:56 +0100
-Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h
-
-From: James Cowgill <jcowgill@debian.org>
-
-[ 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 <merker@debian.org>
-Signed-off-by: James Cowgill <jcowgill@debian.org>
-Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 <linux/ftrace.h>
-+#include <asm-generic/asm-prototypes.h>
-+
-+#endif /* _ASM_RISCV_PROTOTYPES_H */

diff --git a/queue-3.18/series b/queue-3.18/series
index d20cfef0e0e2ab047b10efeafbd32c9f990bef69..a716552493503487f4f7d859b89381417eebaa2e 100644 (file)
--- 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 (file)
index 100b923..0000000
--- 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 <jcowgill@debian.org>
-Date: Thu, 6 Sep 2018 22:57:56 +0100
-Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h
-
-From: James Cowgill <jcowgill@debian.org>
-
-[ 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 <merker@debian.org>
-Signed-off-by: James Cowgill <jcowgill@debian.org>
-Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 <linux/ftrace.h>
-+#include <asm-generic/asm-prototypes.h>
-+
-+#endif /* _ASM_RISCV_PROTOTYPES_H */

diff --git a/queue-4.14/series b/queue-4.14/series
index 90643a7a47cf95eb6d9cd0c383b220bc2e7295f3..e5972170dc89e4b223bdc95a22abe1c5309a3cc2 100644 (file)
--- 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 (file)
index fbf0352..0000000
--- 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 <jcowgill@debian.org>
-Date: Thu, 6 Sep 2018 22:57:56 +0100
-Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h
-
-From: James Cowgill <jcowgill@debian.org>
-
-[ 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 <merker@debian.org>
-Signed-off-by: James Cowgill <jcowgill@debian.org>
-Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 <linux/ftrace.h>
-+#include <asm-generic/asm-prototypes.h>
-+
-+#endif /* _ASM_RISCV_PROTOTYPES_H */

diff --git a/queue-4.4/series b/queue-4.4/series
index f71f62b7c63ddd947fa0ffed990518680b23e339..646b4891811e6163c5e83de0a13d005b487590ff 100644 (file)
--- 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 (file)
index bc321e6..0000000
--- 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 <jcowgill@debian.org>
-Date: Thu, 6 Sep 2018 22:57:56 +0100
-Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h
-
-From: James Cowgill <jcowgill@debian.org>
-
-[ 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 <merker@debian.org>
-Signed-off-by: James Cowgill <jcowgill@debian.org>
-Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 <linux/ftrace.h>
-+#include <asm-generic/asm-prototypes.h>
-+
-+#endif /* _ASM_RISCV_PROTOTYPES_H */

diff --git a/queue-4.9/series b/queue-4.9/series
index f8416299fda34d854085879b600e26d576ad1fd3..3009e483db7c31729fb3a62b4921ad3e903bc98a 100644 (file)
--- 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