]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Jan 2018 08:38:03 +0000 (09:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Jan 2018 08:38:03 +0000 (09:38 +0100)
added patches:
arc-uaccess-dont-use-l-gcc-inline-asm-constraint-modifier.patch
input-elantech-add-new-icbody-type-15.patch

queue-4.4/arc-uaccess-dont-use-l-gcc-inline-asm-constraint-modifier.patch [new file with mode: 0644]
queue-4.4/input-elantech-add-new-icbody-type-15.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/arc-uaccess-dont-use-l-gcc-inline-asm-constraint-modifier.patch b/queue-4.4/arc-uaccess-dont-use-l-gcc-inline-asm-constraint-modifier.patch
new file mode 100644 (file)
index 0000000..cd16875
--- /dev/null
@@ -0,0 +1,44 @@
+From 79435ac78d160e4c245544d457850a56f805ac0d Mon Sep 17 00:00:00 2001
+From: Vineet Gupta <vgupta@synopsys.com>
+Date: Fri, 8 Dec 2017 08:26:58 -0800
+Subject: ARC: uaccess: dont use "l" gcc inline asm constraint modifier
+
+From: Vineet Gupta <vgupta@synopsys.com>
+
+commit 79435ac78d160e4c245544d457850a56f805ac0d upstream.
+
+This used to setup the LP_COUNT register automatically, but now has been
+removed.
+
+There was an earlier fix 3c7c7a2fc8811 which fixed instance in delay.h but
+somehow missed this one as gcc change had not made its way into
+production toolchains and was not pedantic as it is now !
+
+Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arc/include/asm/uaccess.h |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/arch/arc/include/asm/uaccess.h
++++ b/arch/arc/include/asm/uaccess.h
+@@ -673,6 +673,7 @@ __arc_strncpy_from_user(char *dst, const
+               return 0;
+       __asm__ __volatile__(
++      "       mov     lp_count, %5            \n"
+       "       lp      3f                      \n"
+       "1:     ldb.ab  %3, [%2, 1]             \n"
+       "       breq.d  %3, 0, 3f               \n"
+@@ -689,8 +690,8 @@ __arc_strncpy_from_user(char *dst, const
+       "       .word   1b, 4b                  \n"
+       "       .previous                       \n"
+       : "+r"(res), "+r"(dst), "+r"(src), "=r"(val)
+-      : "g"(-EFAULT), "l"(count)
+-      : "memory");
++      : "g"(-EFAULT), "r"(count)
++      : "lp_count", "lp_start", "lp_end", "memory");
+       return res;
+ }
diff --git a/queue-4.4/input-elantech-add-new-icbody-type-15.patch b/queue-4.4/input-elantech-add-new-icbody-type-15.patch
new file mode 100644 (file)
index 0000000..fa48ade
--- /dev/null
@@ -0,0 +1,30 @@
+From 10d900303f1c3a821eb0bef4e7b7ece16768fba4 Mon Sep 17 00:00:00 2001
+From: Aaron Ma <aaron.ma@canonical.com>
+Date: Sat, 25 Nov 2017 16:48:41 -0800
+Subject: Input: elantech - add new icbody type 15
+
+From: Aaron Ma <aaron.ma@canonical.com>
+
+commit 10d900303f1c3a821eb0bef4e7b7ece16768fba4 upstream.
+
+The touchpad of Lenovo Thinkpad L480 reports it's version as 15.
+
+Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/mouse/elantech.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/input/mouse/elantech.c
++++ b/drivers/input/mouse/elantech.c
+@@ -1613,7 +1613,7 @@ static int elantech_set_properties(struc
+               case 5:
+                       etd->hw_version = 3;
+                       break;
+-              case 6 ... 14:
++              case 6 ... 15:
+                       etd->hw_version = 4;
+                       break;
+               default:
index 037002694fe680e8fd9bd8e1f6552fde4202d379..6cb1b1ff75f20f1e85b83a2474d0f12e07903850 100644 (file)
@@ -9,3 +9,5 @@ kernel-make-groups_sort-calling-a-responsibility-group_info-allocators.patch
 kernel-signal.c-protect-the-traced-signal_unkillable-tasks-from-sigkill.patch
 kernel-signal.c-protect-the-signal_unkillable-tasks-from-sig_kernel_only-signals.patch
 kernel-signal.c-remove-the-no-longer-needed-signal_unkillable-check-in-complete_signal.patch
+arc-uaccess-dont-use-l-gcc-inline-asm-constraint-modifier.patch
+input-elantech-add-new-icbody-type-15.patch