commit 1fb68df0221f3d9433af9e9c64aeb8798f1a6264
Author: Jan Rękorajski <[email protected]>
Date: Mon Jan 15 23:12:59 2018 +0100
- more vserver timekeeping fixes
kernel-vserver-fixes.patch | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
---
diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index df4490fd..8284edfe 100644
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -20,3 +20,41 @@
#else
#define vx_adjust_timespec(t) do { } while (0)
+--- linux-4.9.76/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000
+0000
++++ linux-4.9.76-vs2.3.9.5/include/linux/vserver/cvirt.h 2018-01-10
02:50:49.000000000 +0000
+@@ -3,7 +3,7 @@ diff -NurpP --minimal
linux-4.9.76/include/linux/vserver/cvirt.h linux-4.9.76-vs
+
+ struct timespec;
+
+-void vx_vsi_boottime(struct timespec *);
++void vx_vsi_boottime(struct timespec64 *);
+
+ void vx_vsi_uptime(struct timespec *, struct timespec *);
+
+--- linux-4.9.76/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000
+0000
++++ linux-4.9.76-vs2.3.9.5/kernel/vserver/cvirt.c 2018-01-11
08:36:23.000000000 +0000
+@@ -20,11 +20,11 @@ diff -NurpP --minimal linux-4.9.76/kernel/vserver/cvirt.c
linux-4.9.76-vs2.3.9.5
+ #include <asm/uaccess.h>
+
+
+-void vx_vsi_boottime(struct timespec *boottime)
++void vx_vsi_boottime(struct timespec64 *boottime)
+ {
+ struct vx_info *vxi = current_vx_info();
+
+- set_normalized_timespec(boottime,
++ set_normalized_timespec64(boottime,
+ boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
+ boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
+ return;
+@@ -245,8 +245,8 @@ diff -NurpP --minimal linux-4.9.76/kernel/vserver/cvirt.c
linux-4.9.76-vs2.3.9.5
+ struct _vx_cvirt *cvirt = &vxi->cvirt;
+ struct timespec64 uptime;
+
+- ktime_get_ts(&uptime);
+- set_normalized_timespec(&uptime,
++ ktime_get_ts64(&uptime);
++ set_normalized_timespec64(&uptime,
+ uptime.tv_sec - cvirt->bias_uptime.tv_sec,
+ uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/1fb68df0221f3d9433af9e9c64aeb8798f1a6264
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
