From f5af103dc36f93239844721c4574780d90ffe2b6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 20 Aug 2019 09:55:07 -0700 Subject: [PATCH] 4.14-stable patches added patches: input-psmouse-fix-build-error-of-multiple-definition.patch --- ...x-build-error-of-multiple-definition.patch | 39 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-4.14/input-psmouse-fix-build-error-of-multiple-definition.patch diff --git a/queue-4.14/input-psmouse-fix-build-error-of-multiple-definition.patch b/queue-4.14/input-psmouse-fix-build-error-of-multiple-definition.patch new file mode 100644 index 00000000000..fbfb8f48925 --- /dev/null +++ b/queue-4.14/input-psmouse-fix-build-error-of-multiple-definition.patch @@ -0,0 +1,39 @@ +From 49e6979e7e92cf496105b5636f1df0ac17c159c0 Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Tue, 16 Jul 2019 20:17:20 +0200 +Subject: Input: psmouse - fix build error of multiple definition + +From: YueHaibing + +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 +Fixes: 55e3d9224b60 ("Input: psmouse - allow disabing certain protocol extensions") +Signed-off-by: YueHaibing +Signed-off-by: Dmitry Torokhov +Cc: Hui Wang +Signed-off-by: Greg Kroah-Hartman + +--- + 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.14/series b/queue-4.14/series index de627082a21..4197b21cd89 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -57,3 +57,4 @@ revert-tcp-clear-sk_send_head-after-purging-the-writ.patch arm64-compat-allow-single-byte-watchpoints-on-all-addresses.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 -- 2.47.3