X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fvserver%2Fcvirt.c;h=a5192211f6be1ddef0c052de8edc408e6db08370;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=cdcb86a13abe6f56104b95f7c6f3a97b9b3d3de6;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/kernel/vserver/cvirt.c b/kernel/vserver/cvirt.c
index cdcb86a13..a5192211f 100644
--- a/kernel/vserver/cvirt.c
+++ b/kernel/vserver/cvirt.c
@@ -24,10 +24,13 @@
 void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle)
 {
 	struct vx_info *vxi = current->vx_info;
+	struct timeval bias;
+
+	jiffies_to_timeval(vxi->cvirt.bias_jiffies - INITIAL_JIFFIES, &bias);
 
 	set_normalized_timespec(uptime,
-		uptime->tv_sec - vxi->cvirt.bias_tp.tv_sec,
-		uptime->tv_nsec - vxi->cvirt.bias_tp.tv_nsec);
+		uptime->tv_sec - bias.tv_sec,
+		uptime->tv_nsec - bias.tv_usec*1000);
 	if (!idle)
 		return;
 	set_normalized_timespec(idle,