kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Input: input_event - fix the CONFIG_SPARC64 mixup

Browse source 
Arnd Bergmann pointed out that CONFIG_* cannot be used in a uapi header.
Override with an equivalent conditional.

Fixes: 2e746942eb ("Input: input_event - provide override for sparc64")
Fixes: 152194fe9c ("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>
This commit is contained in:
Deepa Dinamani 2019-01-24 00:29:20 -08:00 committed by Dmitry Torokhov
parent ec87da107d
commit 141e5dcaa7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/uapi/linux/input.h
View file

@ -32,7 +32,7 @@ struct input_event {
#define input_event_usec time.tv_usec #define input_event_usec time.tv_usec
#else #else
__kernel_ulong_t __sec; __kernel_ulong_t __sec;
#ifdef CONFIG_SPARC64 #if defined(__sparc__) && defined(__arch64__)
unsigned int __usec; unsigned int __usec;
#else #else
__kernel_ulong_t __usec; __kernel_ulong_t __usec;