diff options
Diffstat (limited to 'drivers/scsi/pmcraid.c')
-rw-r--r-- | drivers/scsi/pmcraid.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index ed31d8cc6266..b2a88200fe54 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <asm/processor.h> | 45 | #include <asm/processor.h> |
46 | #include <linux/libata.h> | 46 | #include <linux/libata.h> |
47 | #include <linux/mutex.h> | 47 | #include <linux/mutex.h> |
48 | #include <linux/ktime.h> | ||
48 | #include <scsi/scsi.h> | 49 | #include <scsi/scsi.h> |
49 | #include <scsi/scsi_host.h> | 50 | #include <scsi/scsi_host.h> |
50 | #include <scsi/scsi_device.h> | 51 | #include <scsi/scsi_device.h> |
@@ -4254,7 +4255,6 @@ static struct scsi_host_template pmcraid_host_template = { | |||
4254 | .use_clustering = ENABLE_CLUSTERING, | 4255 | .use_clustering = ENABLE_CLUSTERING, |
4255 | .shost_attrs = pmcraid_host_attrs, | 4256 | .shost_attrs = pmcraid_host_attrs, |
4256 | .proc_name = PMCRAID_DRIVER_NAME, | 4257 | .proc_name = PMCRAID_DRIVER_NAME, |
4257 | .use_blk_tags = 1, | ||
4258 | }; | 4258 | }; |
4259 | 4259 | ||
4260 | /* | 4260 | /* |
@@ -5563,11 +5563,9 @@ static void pmcraid_set_timestamp(struct pmcraid_cmd *cmd) | |||
5563 | __be32 time_stamp_len = cpu_to_be32(PMCRAID_TIMESTAMP_LEN); | 5563 | __be32 time_stamp_len = cpu_to_be32(PMCRAID_TIMESTAMP_LEN); |
5564 | struct pmcraid_ioadl_desc *ioadl = ioarcb->add_data.u.ioadl; | 5564 | struct pmcraid_ioadl_desc *ioadl = ioarcb->add_data.u.ioadl; |
5565 | 5565 | ||
5566 | struct timeval tv; | ||
5567 | __le64 timestamp; | 5566 | __le64 timestamp; |
5568 | 5567 | ||
5569 | do_gettimeofday(&tv); | 5568 | timestamp = ktime_get_real_seconds() * 1000; |
5570 | timestamp = tv.tv_sec * 1000; | ||
5571 | 5569 | ||
5572 | pinstance->timestamp_data->timestamp[0] = (__u8)(timestamp); | 5570 | pinstance->timestamp_data->timestamp[0] = (__u8)(timestamp); |
5573 | pinstance->timestamp_data->timestamp[1] = (__u8)((timestamp) >> 8); | 5571 | pinstance->timestamp_data->timestamp[1] = (__u8)((timestamp) >> 8); |