drop s390 patch to 4.16

diff --git a/queue-4.16/s390-lib-use-expoline-for-indirect-branches.patch b/queue-4.16/s390-lib-use-expoline-for-indirect-branches.patch
deleted file mode 100644 (file)
index 0e6627f..0000000
--- a/queue-4.16/s390-lib-use-expoline-for-indirect-branches.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 97489e0663fa700d6e7febddc43b58df98d7bcda Mon Sep 17 00:00:00 2001
-From: Martin Schwidefsky <schwidefsky@de.ibm.com>
-Date: Mon, 23 Apr 2018 14:31:36 +0200
-Subject: s390/lib: use expoline for indirect branches
-
-From: Martin Schwidefsky <schwidefsky@de.ibm.com>
-
-commit 97489e0663fa700d6e7febddc43b58df98d7bcda upstream.
-
-The return from the memmove, memset, memcpy, __memset16, __memset32 and
-__memset64 functions are done with "br %r14". These are indirect branches
-as well and need to use execute trampolines for CONFIG_EXPOLINE=y.
-
-Cc: stable@vger.kernel.org # 4.16
-Fixes: f19fbd5ed6 ("s390: introduce execute-trampolines for branches")
-Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
-Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/s390/lib/mem.S |   19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
---- a/arch/s390/lib/mem.S
-+++ b/arch/s390/lib/mem.S
-@@ -7,6 +7,9 @@
- 
- #include <linux/linkage.h>
- #include <asm/export.h>
-+#include <asm/nospec-insn.h>
-+
-+      GEN_BR_THUNK %r14
- 
- /*
-  * void *memmove(void *dest, const void *src, size_t n)
-@@ -33,14 +36,14 @@ ENTRY(memmove)
- .Lmemmove_forward_remainder:
-       larl    %r5,.Lmemmove_mvc
-       ex      %r4,0(%r5)
--      br      %r14
-+      BR_EX   %r14
- .Lmemmove_reverse:
-       ic      %r0,0(%r4,%r3)
-       stc     %r0,0(%r4,%r1)
-       brctg   %r4,.Lmemmove_reverse
-       ic      %r0,0(%r4,%r3)
-       stc     %r0,0(%r4,%r1)
--      br      %r14
-+      BR_EX   %r14
- .Lmemmove_mvc:
-       mvc     0(1,%r1),0(%r3)
- EXPORT_SYMBOL(memmove)
-@@ -77,7 +80,7 @@ ENTRY(memset)
- .Lmemset_clear_remainder:
-       larl    %r3,.Lmemset_xc
-       ex      %r4,0(%r3)
--      br      %r14
-+      BR_EX   %r14
- .Lmemset_fill:
-       cghi    %r4,1
-       lgr     %r1,%r2
-@@ -95,10 +98,10 @@ ENTRY(memset)
-       stc     %r3,0(%r1)
-       larl    %r5,.Lmemset_mvc
-       ex      %r4,0(%r5)
--      br      %r14
-+      BR_EX   %r14
- .Lmemset_fill_exit:
-       stc     %r3,0(%r1)
--      br      %r14
-+      BR_EX   %r14
- .Lmemset_xc:
-       xc      0(1,%r1),0(%r1)
- .Lmemset_mvc:
-@@ -121,7 +124,7 @@ ENTRY(memcpy)
- .Lmemcpy_remainder:
-       larl    %r5,.Lmemcpy_mvc
-       ex      %r4,0(%r5)
--      br      %r14
-+      BR_EX   %r14
- .Lmemcpy_loop:
-       mvc     0(256,%r1),0(%r3)
-       la      %r1,256(%r1)
-@@ -159,10 +162,10 @@ ENTRY(__memset\bits)
-       \insn   %r3,0(%r1)
-       larl    %r5,.L__memset_mvc\bits
-       ex      %r4,0(%r5)
--      br      %r14
-+      BR_EX   %r14
- .L__memset_exit\bits:
-       \insn   %r3,0(%r2)
--      br      %r14
-+      BR_EX   %r14
- .L__memset_mvc\bits:
-       mvc     \bytes(1,%r1),0(%r1)
- .endm

diff --git a/queue-4.16/series b/queue-4.16/series
index 83dc7c3706cdef4a975799ba93f1f7a32948f579..910ac53a939a2da3e3afbb05fc8b665f507ad9a1 100644 (file)
--- a/queue-4.16/series
+++ b/queue-4.16/series
@@ -37,7 +37,6 @@ lib-test_bitmap.c-fix-bitmap-optimisation-tests-to-report-errors-correctly.patch
 radix-tree-fix-multi-order-iteration-race.patch
 mm-don-t-allow-deferred-pages-with-need_per_cpu_km.patch
 drm-i915-gen9-add-waclearhiz_wm_chicken3-for-bxt-and-glk.patch
-s390-lib-use-expoline-for-indirect-branches.patch
 s390-crc32-vx-use-expoline-for-indirect-branches.patch
 s390-qdio-fix-access-to-uninitialized-qdio_q-fields.patch
 s390-cpum_sf-ensure-sample-frequency-of-perf-event-attributes-is-non-zero.patch