Skip to contentSkip to conversation

input: Fix the CONFIG_SPARC64 mixup

PATCH Applied Deepa Dinamani 2 participants 2 messages Jan 21, 2019 – Jan 24, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input: Fix the CONFIG_SPARC64 mixup

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")
---
 include/uapi/linux/input.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/input.h +1 -1
index ffab958bc512..f056b2a00d5c 100644
@@ -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;
Signature · 6 lines
2.17.1

_______________________________________________
Y2038 mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/y2038
maintainer Applied
#1 lore raw
Quoted 6 lines · Deepa Dinamani

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")

Applied, thank you.

Quoted 20 lines
---
 include/uapi/linux/input.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/input.h +1 -1
index ffab958bc512..f056b2a00d5c 100644
@@ -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;
Signature · 1 line
2.17.1
Signature · 1 line
Dmitry