git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
kernel
/
vserver
/
cvirt.c
diff --git
a/kernel/vserver/cvirt.c
b/kernel/vserver/cvirt.c
index
cdcb86a
..
a519221
100644
(file)
--- 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;
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,
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,
if (!idle)
return;
set_normalized_timespec(idle,