From 362396f8e6b9a706445014d7a3e195680bd66bde Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 5 Jan 2019 09:11:30 +0100 Subject: noise: replace getnstimeofday64 with ktime_get_real_ts64 The former was just a wrapper around the latter, and so upstream is now removing it. Also adjust the compat kludge to deal with this. Reported-by: Alex Xu --- src/compat/compat.h | 2 +- src/noise.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/compat/compat.h b/src/compat/compat.h index d20a587..4ffe387 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -647,7 +647,7 @@ struct _____dummy_container { char dev; }; #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) #define timespec64 timespec -#define getnstimeofday64 getnstimeofday +#define ktime_get_real_ts64 ktime_get_real_ts #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) diff --git a/src/noise.c b/src/noise.c index fb65c4f..e629307 100644 --- a/src/noise.c +++ b/src/noise.c @@ -450,7 +450,7 @@ static void tai64n_now(u8 output[NOISE_TIMESTAMP_LEN]) { struct timespec64 now; - getnstimeofday64(&now); + ktime_get_real_ts64(&now); /* https://cr.yp.to/libtai/tai64.html */ *(__be64 *)output = cpu_to_be64(0x400000000000000aULL + now.tv_sec); *(__be32 *)(output + sizeof(__be64)) = cpu_to_be32(now.tv_nsec); -- cgit v1.2.3-59-g8ed1b