|
|
Patch provided by @pgreco
submitted-by-pgreco.patch (1,040 bytes)
diff -Naurp a/drivers/hv/hv_util.c c/drivers/hv/hv_util.c
--- a/drivers/hv/hv_util.c 2020-11-30 14:40:05.000000000 -0300
+++ c/drivers/hv/hv_util.c 2020-12-15 19:41:12.513373167 -0300
@@ -225,7 +225,7 @@ static inline u64 reftime_to_ns(u64 reft
*/
static const u64 HOST_TIMESYNC_DELAY_THRESH = 600 * (u64)NSEC_PER_SEC;
-static int hv_get_adj_host_time(struct timespec *ts)
+static int hv_get_adj_host_time(struct timespec64 *ts)
{
u64 newtime, reftime, timediff_adj;
unsigned long flags;
@@ -248,7 +248,7 @@ static int hv_get_adj_host_time(struct t
}
newtime = host_ts.host_time + timediff_adj;
- *ts = ns_to_timespec(reftime_to_ns(newtime));
+ *ts = ns_to_timespec64(reftime_to_ns(newtime));
spin_unlock_irqrestore(&host_ts.lock, flags);
return ret;
@@ -256,10 +256,10 @@ static int hv_get_adj_host_time(struct t
static void hv_set_host_time(struct work_struct *work)
{
- struct timespec ts;
+ struct timespec64 ts;
if (!hv_get_adj_host_time(&ts))
- do_settimeofday(&ts);
+ do_settimeofday64(&ts);
}
/*
|
|
|
|
After the patch, a new error was seen:
drivers/hv/hv_util.c: In function 'hv_set_host_time':
drivers/hv/hv_util.c:262:3: error: implicit declaration of function 'do_settimeofday64' [-Werror=implicit-function-declaration]
do_settimeofday64(&ts);
^
cc1: all warnings being treated as errors
make[2]: *** [drivers/hv/hv_util.o] Error 1 |
|
|
|
This patch submitted by @pgreco worked!
centos-i386-hv_utils.patch (1,267 bytes)
centos-i386-hv_utils.patch
Submitted-by: Pablo Greco <pablo@fliagreco.com.ar>
diff -Naurp a/drivers/hv/hv_util.c c/drivers/hv/hv_util.c
--- a/drivers/hv/hv_util.c 2020-11-30 14:40:05.000000000 -0300
+++ c/drivers/hv/hv_util.c 2020-12-16 08:16:48.664000186 -0300
@@ -225,7 +225,7 @@ static inline u64 reftime_to_ns(u64 reft
*/
static const u64 HOST_TIMESYNC_DELAY_THRESH = 600 * (u64)NSEC_PER_SEC;
-static int hv_get_adj_host_time(struct timespec *ts)
+static int hv_get_adj_host_time(struct timespec64 *ts)
{
u64 newtime, reftime, timediff_adj;
unsigned long flags;
@@ -248,7 +248,7 @@ static int hv_get_adj_host_time(struct t
}
newtime = host_ts.host_time + timediff_adj;
- *ts = ns_to_timespec(reftime_to_ns(newtime));
+ *ts = ns_to_timespec64(reftime_to_ns(newtime));
spin_unlock_irqrestore(&host_ts.lock, flags);
return ret;
@@ -256,10 +256,17 @@ static int hv_get_adj_host_time(struct t
static void hv_set_host_time(struct work_struct *work)
{
- struct timespec ts;
+ struct timespec64 ts;
- if (!hv_get_adj_host_time(&ts))
+ if (!hv_get_adj_host_time(&ts)) {
+#if __BITS_PER_LONG == 64
do_settimeofday(&ts);
+#else
+ struct timespec ts32;
+ ts32 = timespec64_to_timespec(ts);
+ do_settimeofday(&ts32);
+#endif
+ }
}
/*
|
|
