Merge tag '4.4-scsi-mkp' into misc

SCSI queue for 4.4.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 48d62249c226..b2a88200fe54 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -45,6 +45,7 @@
 #include <asm/processor.h>
 #include <linux/libata.h>
 #include <linux/mutex.h>
+#include <linux/ktime.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
@@ -5562,11 +5563,9 @@ static void pmcraid_set_timestamp(struct pmcraid_cmd *cmd)
         __be32 time_stamp_len = cpu_to_be32(PMCRAID_TIMESTAMP_LEN);
         struct pmcraid_ioadl_desc *ioadl = ioarcb->add_data.u.ioadl;
 
-        struct timeval tv;
         __le64 timestamp;
 
-        do_gettimeofday(&tv);
-        timestamp = tv.tv_sec * 1000;
+        timestamp = ktime_get_real_seconds() * 1000;
 
         pinstance->timestamp_data->timestamp[0] = (__u8)(timestamp);
         pinstance->timestamp_data->timestamp[1] = (__u8)((timestamp) >> 8);