From: Greg Kroah-Hartman Date: Tue, 29 Jan 2019 13:32:54 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.9.154~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5beacace2d560670b0716becdcdf4c383bf6fe7d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: input-input_event-fix-the-config_sparc64-mixup.patch --- diff --git a/queue-4.19/input-input_event-fix-the-config_sparc64-mixup.patch b/queue-4.19/input-input_event-fix-the-config_sparc64-mixup.patch new file mode 100644 index 00000000000..10640e9bab3 --- /dev/null +++ b/queue-4.19/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 +Date: Thu, 24 Jan 2019 00:29:20 -0800 +Subject: Input: input_event - fix the CONFIG_SPARC64 mixup + +From: Deepa Dinamani + +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 +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + 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.19/series b/queue-4.19/series index f3ea35a07c1..c10b66a60f8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -101,3 +101,4 @@ nvmet-rdma-fix-null-dereference-under-heavy-load.patch revert-mm-memory_hotplug-initialize-struct-pages-for-the-full-memory-section.patch usb-dwc3-gadget-clear-req-needs_extra_trb-flag-on-cleanup.patch ide-fix-a-typo-in-the-settings-proc-file-name.patch +input-input_event-fix-the-config_sparc64-mixup.patch