Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e746942 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Dmitry Torokhov
Browse files

Input: input_event - provide override for sparc64 



The usec part of the timeval is defined as
__kernel_suseconds_t	tv_usec; /* microseconds */

Arnd noticed that sparc64 is the only architecture that defines
__kernel_suseconds_t as int rather than long.

This breaks the current y2038 fix for kernel as we only access and define
the timeval struct for non-kernel use cases.  But, this was hidden by an
another typo in the use of __KERNEL__ qualifier.

Fix the typo, and provide an override for sparc64.

Fixes: 152194fe ("Input: extend usable life of event timestamps to 2106 on 32 bit systems")
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 592b15ba

include/uapi/linux/input.h

+5 −1
Original line number Diff line number Diff line
@@ -26,13 +26,17 @@ 
 */



struct input_event {

#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL)

#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__)

	struct timeval time;

#define input_event_sec time.tv_sec

#define input_event_usec time.tv_usec

#else

	__kernel_ulong_t __sec;

#ifdef CONFIG_SPARC64

	unsigned int __usec;

#else

	__kernel_ulong_t __usec;

#endif

#define input_event_sec  __sec

#define input_event_usec __usec

#endif