4.14-stable patches

added patches:
	sparc64-repair-calling-incorrect-hweight-function-from-stubs.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index 70c106f12aca15a1e549d0992d4548718f61bbc4..468dffe2ddd90e17fe7c1119b97f399d875df5aa 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -114,3 +114,4 @@ revert-mlx5-move-affinity-hints-assignments-to-generic-code.patch
 skbuff-orphan-frags-before-zerocopy-clone.patch
 skbuff-skb_copy_ubufs-must-release-uarg-even-without-user-frags.patch
 skbuff-in-skb_copy_ubufs-unclone-before-releasing-zerocopy.patch
+sparc64-repair-calling-incorrect-hweight-function-from-stubs.patch

diff --git a/queue-4.14/sparc64-repair-calling-incorrect-hweight-function-from-stubs.patch b/queue-4.14/sparc64-repair-calling-incorrect-hweight-function-from-stubs.patch
new file mode 100644 (file)
index 0000000..3936bd4
--- /dev/null
+++ b/queue-4.14/sparc64-repair-calling-incorrect-hweight-function-from-stubs.patch
@@ -0,0 +1,34 @@
+From foo@baz Mon Jan  1 11:05:39 CET 2018
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 25 Dec 2017 03:43:53 +0100
+Subject: [PATCH] sparc64: repair calling incorrect hweight function from stubs
+
+From: Jan Engelhardt <jengelh@inai.de>
+
+
+[ Upstream commit 59585b4be9ae4dc6506551709bdcd6f5210b8a01 ]
+
+Commit v4.12-rc4-1-g9289ea7f952b introduced a mistake that made the
+64-bit hweight stub call the 16-bit hweight function.
+
+Fixes: 9289ea7f952b ("sparc64: Use indirect calls in hamming weight stubs")
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/sparc/lib/hweight.S |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/sparc/lib/hweight.S
++++ b/arch/sparc/lib/hweight.S
+@@ -44,8 +44,8 @@ EXPORT_SYMBOL(__arch_hweight32)
+       .previous
+ 
+ ENTRY(__arch_hweight64)
+-      sethi   %hi(__sw_hweight16), %g1
+-      jmpl    %g1 + %lo(__sw_hweight16), %g0
++      sethi   %hi(__sw_hweight64), %g1
++      jmpl    %g1 + %lo(__sw_hweight64), %g0
+        nop
+ ENDPROC(__arch_hweight64)
+ EXPORT_SYMBOL(__arch_hweight64)