Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[cascardo/linux.git] / drivers / misc / ibmasm / ibmasm.h

diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 5bd1277..9fea49d 100644 (file)
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -34,6 +34,7 @@
 #include <linux/kref.h>
 #include <linux/device.h>
 #include <linux/input.h>
+#include <linux/time64.h>
 
 /* Driver identification */
 #define DRIVER_NAME    "ibmasm"
@@ -53,9 +54,11 @@ extern int ibmasm_debug;
 
 static inline char *get_timestamp(char *buf)
 {
-       struct timeval now;
-       do_gettimeofday(&now);
-       sprintf(buf, "%lu.%lu", now.tv_sec, now.tv_usec);
+       struct timespec64 now;
+
+       ktime_get_real_ts64(&now);
+       sprintf(buf, "%llu.%.08lu", (long long)now.tv_sec,
+                               now.tv_nsec / NSEC_PER_USEC);
        return buf;
 }