From f61ee4df51b191142f07778e849e58ef424c2c5d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 10 Jun 2017 14:42:12 +0200 Subject: [PATCH] dropped queue-4.4/sparc64-add-__multi3-for-gcc-7.x-and-later.patch I doubt anyone is building 4.4 for sparc with gcc 7.x, if so, they can provide a working backport for it :) Signed-off-by: Greg Kroah-Hartman --- queue-4.4/series | 1 - ...4-add-__multi3-for-gcc-7.x-and-later.patch | 67 ------------------- 2 files changed, 68 deletions(-) delete mode 100644 queue-4.4/sparc64-add-__multi3-for-gcc-7.x-and-later.patch diff --git a/queue-4.4/series b/queue-4.4/series index 52ae13b9724..54216f24e4a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -7,7 +7,6 @@ ipv6-fix-leak-in-ipv6_gso_segment.patch net-ping-do-not-abuse-udp_poll.patch net-ethoc-enable-napi-before-poll-may-be-scheduled.patch net-bridge-start-hello-timer-only-if-device-is-up.patch -sparc64-add-__multi3-for-gcc-7.x-and-later.patch sparc64-mm-fix-copy_tsb-to-correctly-copy-huge-page-tsbs.patch sparc-machine-description-indices-can-vary.patch sparc64-reset-mm-cpumask-after-wrap.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 index 2c541caf916..00000000000 --- a/queue-4.4/sparc64-add-__multi3-for-gcc-7.x-and-later.patch +++ /dev/null @@ -1,67 +0,0 @@ -From foo@baz Thu Jun 8 09:20:28 CEST 2017 -From: "David S. Miller" -Date: Mon, 5 Jun 2017 11:28:57 -0700 -Subject: sparc64: Add __multi3 for gcc 7.x and later. - -From: "David S. Miller" - - -[ Upstream commit 1b4af13ff2cc6897557bb0b8d9e2fad4fa4d67aa ] - -Reported-by: Waldemar Brodkorb -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - arch/sparc/lib/Makefile | 1 + - arch/sparc/lib/multi3.S | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 36 insertions(+) - create mode 100644 arch/sparc/lib/multi3.S - ---- 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 -+#include -+ -+ .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) -- 2.47.3