linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / vserver / cvirt_def.h

diff --git a/include/linux/vserver/cvirt_def.h b/include/linux/vserver/cvirt_def.h
index c352890..c368c2e 100644 (file)
--- a/include/linux/vserver/cvirt_def.h
+++ b/include/linux/vserver/cvirt_def.h
@@ -8,6 +8,8 @@
 #include <linux/time.h>
 #include <asm/atomic.h>
 
+#include "cacct.h"
+
 
 struct _vx_usage_stat {
        uint64_t user;
@@ -23,10 +25,10 @@ struct _vx_syslog {
        wait_queue_head_t log_wait;
        spinlock_t logbuf_lock;         /* lock for the log buffer */
 
-       unsigned long log_start;        /* next char to be read by syslog() */
-       unsigned long con_start;        /* next char to be sent to consoles */
-       unsigned long log_end;          /* most-recently-written-char + 1 */
-       unsigned long logged_chars;     /* #chars since last read+clear operation */
+       unsigned long log_start;        /* next char to be read by syslog() */
+       unsigned long con_start;        /* next char to be sent to consoles */
+       unsigned long log_end;  /* most-recently-written-char + 1 */
+       unsigned long logged_chars;     /* #chars since last read+clear operation */
 
        char log_buf[1024];
 };
@@ -56,8 +58,6 @@ struct _vx_cvirt {
 
        atomic_t total_forks;           /* number of forks so far */
 
-       struct _vx_usage_stat cpustat[NR_CPUS];
-
        struct _vx_syslog syslog;
 };
 
@@ -71,7 +71,7 @@ struct _vx_sock_acc {
 struct _vx_cacct {
        unsigned long total_forks;
 
-       struct _vx_sock_acc sock[5][3];
+       struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
 };
 
 #endif /* _VX_CVIRT_DEF_H */