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.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[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
5ac0c2e
..
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 <linux/time.h>
#include <asm/atomic.h>
+#include "cacct.h"
+
struct _vx_usage_stat {
uint64_t user;
struct _vx_usage_stat {
uint64_t user;
@@
-69,7
+71,7
@@
struct _vx_sock_acc {
struct _vx_cacct {
unsigned long total_forks;
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 */
};
#endif /* _VX_CVIRT_DEF_H */