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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
kernel
/
vserver
/
cvirt_init.h
diff --git
a/kernel/vserver/cvirt_init.h
b/kernel/vserver/cvirt_init.h
index
8697386
..
52bd4da
100644
(file)
--- a/
kernel/vserver/cvirt_init.h
+++ b/
kernel/vserver/cvirt_init.h
@@
-1,4
+1,8
@@
+
+#include <linux/config.h>
+
+
extern uint64_t vx_idle_jiffies(void);
static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
extern uint64_t vx_idle_jiffies(void);
static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
@@
-27,8
+31,8
@@
static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
cvirt->load[0] = 0;
cvirt->load[1] = 0;
cvirt->load[2] = 0;
cvirt->load[0] = 0;
cvirt->load[1] = 0;
cvirt->load[2] = 0;
-
atomic_set(&cvirt->total_forks, 0);
atomic_set(&cvirt->total_forks, 0);
+
spin_lock_init(&cvirt->syslog.logbuf_lock);
init_waitqueue_head(&cvirt->syslog.log_wait);
cvirt->syslog.log_start = 0;
spin_lock_init(&cvirt->syslog.logbuf_lock);
init_waitqueue_head(&cvirt->syslog.log_wait);
cvirt->syslog.log_start = 0;