From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 29 Jan 2019 13:33:45 +0000 (+0100)
Subject: 4.20-stable patches
X-Git-Tag: v4.9.154~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=091e63e7ac01636fa39f2a534802856fbbe94e5f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.20-stable patches

added patches:
	input-input_event-fix-the-config_sparc64-mixup.patch
---

diff --git a/queue-4.20/input-input_event-fix-the-config_sparc64-mixup.patch b/queue-4.20/input-input_event-fix-the-config_sparc64-mixup.patch
new file mode 100644
index 00000000000..10640e9bab3
--- /dev/null
+++ b/queue-4.20/input-input_event-fix-the-config_sparc64-mixup.patch
@@ -0,0 +1,33 @@
+From 141e5dcaa7356077028b4cd48ec351a38c70e5e5 Mon Sep 17 00:00:00 2001
+From: Deepa Dinamani <deepa.kernel@gmail.com>
+Date: Thu, 24 Jan 2019 00:29:20 -0800
+Subject: Input: input_event - fix the CONFIG_SPARC64 mixup
+
+From: Deepa Dinamani <deepa.kernel@gmail.com>
+
+commit 141e5dcaa7356077028b4cd48ec351a38c70e5e5 upstream.
+
+Arnd Bergmann pointed out that CONFIG_* cannot be used in a uapi header.
+Override with an equivalent conditional.
+
+Fixes: 2e746942ebac ("Input: input_event - provide override for sparc64")
+Fixes: 152194fe9c3f ("Input: extend usable life of event timestamps to 2106 on 32 bit systems")
+Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/input.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/uapi/linux/input.h
++++ b/include/uapi/linux/input.h
+@@ -32,7 +32,7 @@ struct input_event {
+ #define input_event_usec time.tv_usec
+ #else
+ 	__kernel_ulong_t __sec;
+-#ifdef CONFIG_SPARC64
++#if defined(__sparc__) && defined(__arch64__)
+ 	unsigned int __usec;
+ #else
+ 	__kernel_ulong_t __usec;
diff --git a/queue-4.20/series b/queue-4.20/series
index 287c96d86f8..e778a7aef00 100644
--- a/queue-4.20/series
+++ b/queue-4.20/series
@@ -115,3 +115,4 @@ mt76x0-do-not-perform-mcu-calibration-for-mt7630.patch
 mt76x0-antenna-select-corrections.patch
 mt76x0-phy-unify-calibration-between-mt76x0u-and-mt76x0e.patch
 ide-fix-a-typo-in-the-settings-proc-file-name.patch
+input-input_event-fix-the-config_sparc64-mixup.patch