drop 2 4.4 patches

diff --git a/queue-4.4/series b/queue-4.4/series
index 733e25bd6ff1a631a90c8407ab7d00285de61582..1f932a1956d54787a3622a3ac7cace730f707d02 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -32,6 +32,4 @@ drm-i915-disable-lvds-on-radiant-p845.patch
 kbuild-change-cc_optimize_for_size-definition.patch
 fix-io_destroy-aio_complete-race.patch
 mm-fix-the-null-mapping-case-in-__isolate_lru_page.patch
-sparc64-add-__multi3-for-gcc-7.x-and-later.patch
-sparc64-don-t-clibber-fixed-registers-in-__multi4.patch
 sparc64-fix-build-warnings-with-gcc-7.patch

diff --git a/queue-4.4/sparc64-add-__multi3-for-gcc-7.x-and-later.patch b/queue-4.4/sparc64-add-__multi3-for-gcc-7.x-and-later.patch
deleted file mode 100644 (file)
index 0e4d46c..0000000
--- a/queue-4.4/sparc64-add-__multi3-for-gcc-7.x-and-later.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1b4af13ff2cc6897557bb0b8d9e2fad4fa4d67aa Mon Sep 17 00:00:00 2001
-From: "David S. Miller" <davem@davemloft.net>
-Date: Mon, 5 Jun 2017 11:28:57 -0700
-Subject: sparc64: Add __multi3 for gcc 7.x and later.
-
-From: David S. Miller <davem@davemloft.net>
-
-commit 1b4af13ff2cc6897557bb0b8d9e2fad4fa4d67aa upstream.
-
-Reported-by: Waldemar Brodkorb <wbx@openadk.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/sparc/lib/Makefile |    1 +
- arch/sparc/lib/multi3.S |   35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 36 insertions(+)
-
---- a/arch/sparc/lib/Makefile
-+++ b/arch/sparc/lib/Makefile
-@@ -15,6 +15,7 @@ lib-$(CONFIG_SPARC32) += copy_user.o loc
- lib-$(CONFIG_SPARC64) += atomic_64.o
- lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o
- lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o
-+lib-$(CONFIG_SPARC64) += multi3.o
- 
- lib-$(CONFIG_SPARC64) += copy_page.o clear_page.o bzero.o
- lib-$(CONFIG_SPARC64) += csum_copy.o csum_copy_from_user.o csum_copy_to_user.o
---- /dev/null
-+++ b/arch/sparc/lib/multi3.S
-@@ -0,0 +1,35 @@
-+#include <linux/linkage.h>
-+#include <asm/export.h>
-+
-+      .text
-+      .align  4
-+ENTRY(__multi3) /* %o0 = u, %o1 = v */
-+      mov     %o1, %g1
-+      srl     %o3, 0, %g4
-+      mulx    %g4, %g1, %o1
-+      srlx    %g1, 0x20, %g3
-+      mulx    %g3, %g4, %g5
-+      sllx    %g5, 0x20, %o5
-+      srl     %g1, 0, %g4
-+      sub     %o1, %o5, %o5
-+      srlx    %o5, 0x20, %o5
-+      addcc   %g5, %o5, %g5
-+      srlx    %o3, 0x20, %o5
-+      mulx    %g4, %o5, %g4
-+      mulx    %g3, %o5, %o5
-+      sethi   %hi(0x80000000), %g3
-+      addcc   %g5, %g4, %g5
-+      srlx    %g5, 0x20, %g5
-+      add     %g3, %g3, %g3
-+      movcc   %xcc, %g0, %g3
-+      addcc   %o5, %g5, %o5
-+      sllx    %g4, 0x20, %g4
-+      add     %o1, %g4, %o1
-+      add     %o5, %g3, %g2
-+      mulx    %g1, %o2, %g1
-+      add     %g1, %g2, %g1
-+      mulx    %o0, %o3, %o0
-+      retl
-+       add    %g1, %o0, %o0
-+ENDPROC(__multi3)
-+EXPORT_SYMBOL(__multi3)

diff --git a/queue-4.4/sparc64-don-t-clibber-fixed-registers-in-__multi4.patch b/queue-4.4/sparc64-don-t-clibber-fixed-registers-in-__multi4.patch
deleted file mode 100644 (file)
index 1f5cce8..0000000
--- a/queue-4.4/sparc64-don-t-clibber-fixed-registers-in-__multi4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 79db795833bf5c3e798bcd7a5aeeee3fb0505927 Mon Sep 17 00:00:00 2001
-From: "David S. Miller" <davem@davemloft.net>
-Date: Tue, 15 Aug 2017 21:32:19 -0700
-Subject: sparc64: Don't clibber fixed registers in __multi4.
-
-From: David S. Miller <davem@davemloft.net>
-
-commit 79db795833bf5c3e798bcd7a5aeeee3fb0505927 upstream.
-
-%g4 and %g5 are fixed registers used by the kernel for the thread
-pointer and the per-cpu offset.  Use %o4 and %g7 instead.
-
-Diagnosis by Anthony Yznaga.
-
-Fixes: 1b4af13ff2cc ("sparc64: Add __multi3 for gcc 7.x and later.")
-Reported-by: Anatoly Pugachev <matorola@gmail.com>
-Tested-by: Anatoly Pugachev <matorola@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/sparc/lib/multi3.S |   24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
---- a/arch/sparc/lib/multi3.S
-+++ b/arch/sparc/lib/multi3.S
-@@ -5,26 +5,26 @@
-       .align  4
- ENTRY(__multi3) /* %o0 = u, %o1 = v */
-       mov     %o1, %g1
--      srl     %o3, 0, %g4
--      mulx    %g4, %g1, %o1
-+      srl     %o3, 0, %o4
-+      mulx    %o4, %g1, %o1
-       srlx    %g1, 0x20, %g3
--      mulx    %g3, %g4, %g5
--      sllx    %g5, 0x20, %o5
--      srl     %g1, 0, %g4
-+      mulx    %g3, %o4, %g7
-+      sllx    %g7, 0x20, %o5
-+      srl     %g1, 0, %o4
-       sub     %o1, %o5, %o5
-       srlx    %o5, 0x20, %o5
--      addcc   %g5, %o5, %g5
-+      addcc   %g7, %o5, %g7
-       srlx    %o3, 0x20, %o5
--      mulx    %g4, %o5, %g4
-+      mulx    %o4, %o5, %o4
-       mulx    %g3, %o5, %o5
-       sethi   %hi(0x80000000), %g3
--      addcc   %g5, %g4, %g5
--      srlx    %g5, 0x20, %g5
-+      addcc   %g7, %o4, %g7
-+      srlx    %g7, 0x20, %g7
-       add     %g3, %g3, %g3
-       movcc   %xcc, %g0, %g3
--      addcc   %o5, %g5, %o5
--      sllx    %g4, 0x20, %g4
--      add     %o1, %g4, %o1
-+      addcc   %o5, %g7, %o5
-+      sllx    %o4, 0x20, %o4
-+      add     %o1, %o4, %o1
-       add     %o5, %g3, %g2
-       mulx    %g1, %o2, %g1
-       add     %g1, %g2, %g1