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
Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
kernel
/
vserver
/
cvirt.c
diff --git
a/kernel/vserver/cvirt.c
b/kernel/vserver/cvirt.c
index
4805303
..
fb0684f
100644
(file)
--- a/
kernel/vserver/cvirt.c
+++ b/
kernel/vserver/cvirt.c
@@
-68,8
+68,9
@@
void vx_update_load(struct vx_info *vxi)
uint32_t now, last, delta;
unsigned int nr_running, nr_uninterruptible;
unsigned int total;
uint32_t now, last, delta;
unsigned int nr_running, nr_uninterruptible;
unsigned int total;
+ unsigned long flags;
- spin_lock
(&vxi->cvirt.load_lock
);
+ spin_lock
_irqsave(&vxi->cvirt.load_lock, flags
);
now = jiffies;
last = vxi->cvirt.load_last;
now = jiffies;
last = vxi->cvirt.load_last;
@@
-92,7
+93,7
@@
void vx_update_load(struct vx_info *vxi)
vxi->cvirt.load_last = now;
out:
atomic_inc(&vxi->cvirt.load_updates);
vxi->cvirt.load_last = now;
out:
atomic_inc(&vxi->cvirt.load_updates);
- spin_unlock
(&vxi->cvirt.load_lock
);
+ spin_unlock
_irqrestore(&vxi->cvirt.load_lock, flags
);
}
}