diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-04 12:53:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-04 12:53:04 +1000 |
| commit | 19873c6fcd8f259d517c1410dc0e01ef58417f24 (patch) | |
| tree | 53f67767771ff6e63a77fe938c3d6ec3deba17f7 | |
| parent | 649a957a690b9568d3e164fb36eb06c46540fbf5 (diff) | |
| parent | 549eb7b22e245064dcdc17380538718492f4ca9c (diff) | |
| download | linux-next-19873c6fcd8f259d517c1410dc0e01ef58417f24.tar.gz | |
Merge remote-tracking branch 'y2038/y2038'
| -rw-r--r-- | fs/afs/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/afs/main.c b/fs/afs/main.c index 35de0c04729f..129ff432391c 100644 --- 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; |