Merge remote-tracking branch 'y2038/y2038'

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index b5029e543b918b33802ae5b18c613d1363b209eb..15dff7099955b857d7a343661319ba9002cdea77 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -6,6 +6,7 @@
  */
 #include "qla_def.h"
 #include <linux/delay.h>
+#include <linux/ktime.h>
 #include <linux/pci.h>
 #include <linux/ratelimit.h>
 #include <linux/vmalloc.h>
@@ -1812,7 +1813,6 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
        struct host_system_info *phost_info;
        struct register_host_info *preg_hsi;
        struct new_utsname *p_sysid = NULL;
-       struct timeval tv;
 
        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
        if (!sp)
@@ -1886,8 +1886,7 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
                            p_sysid->domainname, DOMNAME_LENGTH);
                        strncpy(phost_info->hostdriver,
                            QLA2XXX_VERSION, VERSION_LENGTH);
-                       do_gettimeofday(&tv);
-                       preg_hsi->utc = (uint64_t)tv.tv_sec;
+                       preg_hsi->utc = (uint64_t)ktime_get_real_seconds();
                        ql_dbg(ql_dbg_init, vha, 0x0149,
                            "ISP%04X: Host registration with firmware\n",
                            ha->pdev->device);

diff --git a/fs/afs/main.c b/fs/afs/main.c
index 35de0c04729fdbe357b10ddab7f870f3b560d8cc..129ff432391cf9f61a72543bcc246bb7c64770ca 100644 (file)
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
+#include <linux/ktime.h>
 #include "internal.h"
 
 MODULE_DESCRIPTION("AFS Client File System");
@@ -37,7 +38,6 @@ struct workqueue_struct *afs_wq;
  */
 static int __init afs_get_client_UUID(void)
 {
-       struct timespec ts;
        u64 uuidtime;
        u16 clockseq;
        int ret;
@@ -48,9 +48,7 @@ static int __init afs_get_client_UUID(void)
        if (ret < 0)
                return ret;
 
-       getnstimeofday(&ts);
-       uuidtime = (u64) ts.tv_sec * 1000 * 1000 * 10;
-       uuidtime += ts.tv_nsec / 100;
+       uuidtime = ktime_divns(ktime_get_real(), 100);
        uuidtime += AFS_UUID_TO_UNIX_TIME;
        afs_uuid.time_low = uuidtime;
        afs_uuid.time_mid = uuidtime >> 32;