1*4882a593SmuzhiyunFrom 70c5dd9e858ed577a4bbe7ec8920934c89df08fc Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 30 Nov 2019 11:58:58 -0800 4*4882a593SmuzhiyunSubject: [PATCH] Fix build on 32bit arches with 64bit time_t 5*4882a593Smuzhiyun 6*4882a593Smuzhiyuntime element is deprecated on new input_event structure in kernel's 7*4882a593Smuzhiyuninput.h [1] 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 12*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 13*4882a593Smuzhiyun--- 14*4882a593SmuzhiyunUpstream status: commit 648f5c1a9e0 15*4882a593Smuzhiyun 16*4882a593Smuzhiyun evtest.c | 7 ++++++- 17*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 1 deletion(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/evtest.c b/evtest.c 20*4882a593Smuzhiyunindex 548c203564d3..8d592f42bdca 100644 21*4882a593Smuzhiyun--- a/evtest.c 22*4882a593Smuzhiyun+++ b/evtest.c 23*4882a593Smuzhiyun@@ -61,6 +61,11 @@ 24*4882a593Smuzhiyun #include <sys/types.h> 25*4882a593Smuzhiyun #include <unistd.h> 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun+#ifndef input_event_sec 28*4882a593Smuzhiyun+#define input_event_sec time.tv_sec 29*4882a593Smuzhiyun+#define input_event_usec time.tv_usec 30*4882a593Smuzhiyun+#endif 31*4882a593Smuzhiyun+ 32*4882a593Smuzhiyun #define BITS_PER_LONG (sizeof(long) * 8) 33*4882a593Smuzhiyun #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) 34*4882a593Smuzhiyun #define OFF(x) ((x)%BITS_PER_LONG) 35*4882a593Smuzhiyun@@ -1140,7 +1145,7 @@ static int print_events(int fd) 36*4882a593Smuzhiyun type = ev[i].type; 37*4882a593Smuzhiyun code = ev[i].code; 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); 40*4882a593Smuzhiyun+ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec); 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun if (type == EV_SYN) { 43*4882a593Smuzhiyun if (code == SYN_MT_REPORT) 44*4882a593Smuzhiyun-- 45*4882a593Smuzhiyun2.25.1 46*4882a593Smuzhiyun 47