Input: input_event - fix the CONFIG_SPARC64 mixup
authorDeepa Dinamani <deepa.kernel@gmail.com>
Thu, 24 Jan 2019 08:29:20 +0000 (00:29 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Jan 2019 08:38:39 +0000 (00:38 -0800)
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>
include/uapi/linux/input.h

index ffab958bc5123d99964141826d6e2fdba96e2dd6..f056b2a00d5c7695a69826786b5e2336c79c3c31 100644 (file)
@@ -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;