From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 20 Aug 2019 16:55:13 +0000 (-0700)
Subject: 4.19-stable patches
X-Git-Tag: v4.19.68~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df9da373840daf393a9ec424597e7e9f4830f19f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	input-psmouse-fix-build-error-of-multiple-definition.patch
---

diff --git a/queue-4.19/input-psmouse-fix-build-error-of-multiple-definition.patch b/queue-4.19/input-psmouse-fix-build-error-of-multiple-definition.patch
new file mode 100644
index 00000000000..fbfb8f48925
--- /dev/null
+++ b/queue-4.19/input-psmouse-fix-build-error-of-multiple-definition.patch
@@ -0,0 +1,39 @@
+From 49e6979e7e92cf496105b5636f1df0ac17c159c0 Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Tue, 16 Jul 2019 20:17:20 +0200
+Subject: Input: psmouse - fix build error of multiple definition
+
+From: YueHaibing <yuehaibing@huawei.com>
+
+commit 49e6979e7e92cf496105b5636f1df0ac17c159c0 upstream.
+
+trackpoint_detect() should be static inline while
+CONFIG_MOUSE_PS2_TRACKPOINT is not set, otherwise, we build fails:
+
+drivers/input/mouse/alps.o: In function `trackpoint_detect':
+alps.c:(.text+0x8e00): multiple definition of `trackpoint_detect'
+drivers/input/mouse/psmouse-base.o:psmouse-base.c:(.text+0x1b50): first defined here
+
+Reported-by: Hulk Robot <hulkci@huawei.com>
+Fixes: 55e3d9224b60 ("Input: psmouse - allow disabing certain protocol extensions")
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Cc: Hui Wang <hui.wang@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/mouse/trackpoint.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/input/mouse/trackpoint.h
++++ b/drivers/input/mouse/trackpoint.h
+@@ -161,7 +161,8 @@ struct trackpoint_data {
+ #ifdef CONFIG_MOUSE_PS2_TRACKPOINT
+ int trackpoint_detect(struct psmouse *psmouse, bool set_properties);
+ #else
+-inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
++static inline int trackpoint_detect(struct psmouse *psmouse,
++				    bool set_properties)
+ {
+ 	return -ENOSYS;
+ }
diff --git a/queue-4.19/series b/queue-4.19/series
index b367d897ba0..a479d1aae59 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -69,3 +69,4 @@ drm-i915-cfl-add-a-new-cfl-pci-id.patch
 dm-disable-discard-if-the-underlying-storage-no-longer-supports-it.patch
 arm64-ftrace-ensure-module-ftrace-trampoline-is-coherent-with-i-side.patch
 netfilter-conntrack-use-consistent-ct-id-hash-calculation.patch
+input-psmouse-fix-build-error-of-multiple-definition.patch