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 ecc34e1..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)
@@ -27,6 +31,14 @@ static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
        cvirt->load[0] = 0;
        cvirt->load[1] = 0;
        cvirt->load[2] = 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;
+       cvirt->syslog.log_end = 0;
+       cvirt->syslog.con_start = 0;
+       cvirt->syslog.logged_chars = 0;
 }
 
 static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
@@ -43,6 +55,9 @@ static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
        vxwprintk((value = atomic_read(&cvirt->nr_uninterruptible)),
                "!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
                cvirt, value);
+       vxwprintk((value = atomic_read(&cvirt->nr_onhold)),
+               "!!! cvirt: %p[nr_onhold] = %d on exit.",
+               cvirt, value);
 #endif
        return;
 }