Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / char / ipmi / ipmi_ssif.c

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 877205d2204686b0f39c3c798ce5ecf9fa19d358..90e6246622572966a9037350e8fdabed743d7961 100644 (file)
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -52,6 +52,7 @@
 #include <linux/kthread.h>
 #include <linux/acpi.h>
 #include <linux/ctype.h>
+#include <linux/time64.h>
 
 #define PFX "ipmi_ssif: "
 #define DEVICE_NAME "ipmi_ssif"
@@ -1041,12 +1042,12 @@ static void sender(void                *send_info,
        start_next_msg(ssif_info, flags);
 
        if (ssif_info->ssif_debug & SSIF_DEBUG_TIMING) {
-               struct timeval t;
+               struct timespec64 t;
 
-               do_gettimeofday(&t);
-               pr_info("**Enqueue %02x %02x: %ld.%6.6ld\n",
+               ktime_get_real_ts64(&t);
+               pr_info("**Enqueue %02x %02x: %lld.%6.6ld\n",
                       msg->data[0], msg->data[1],
-                      (long) t.tv_sec, (long) t.tv_usec);
+                      (long long) t.tv_sec, (long) t.tv_nsec / NSEC_PER_USEC);
        }
 }