upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / kernel / vserver / limit_proc.h

diff --git a/kernel/vserver/limit_proc.h b/kernel/vserver/limit_proc.h
index 97696e9..f318277 100644 (file)
--- a/kernel/vserver/limit_proc.h
+++ b/kernel/vserver/limit_proc.h
@@ -32,14 +32,24 @@ static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
                "VM"    VX_LIMIT_FMT
                "VML"   VX_LIMIT_FMT
                "RSS"   VX_LIMIT_FMT
+               "ANON"  VX_LIMIT_FMT
                "FILES" VX_LIMIT_FMT
+               "OFD"   VX_LIMIT_FMT
+               "LOCKS" VX_LIMIT_FMT
                "SOCK"  VX_LIMIT_FMT
+               "MSGQ"  VX_LIMIT_FMT
+               "SHM"   VX_LIMIT_FMT
                VX_LIMIT_ARG(RLIMIT_NPROC)
                VX_LIMIT_ARG(RLIMIT_AS)
                VX_LIMIT_ARG(RLIMIT_MEMLOCK)
                VX_LIMIT_ARG(RLIMIT_RSS)
+               VX_LIMIT_ARG(VLIMIT_ANON)
                VX_LIMIT_ARG(RLIMIT_NOFILE)
+               VX_LIMIT_ARG(VLIMIT_OPENFD)
+               VX_LIMIT_ARG(RLIMIT_LOCKS)
                VX_LIMIT_ARG(VLIMIT_NSOCK)
+               VX_LIMIT_ARG(RLIMIT_MSGQUEUE)
+               VX_LIMIT_ARG(VLIMIT_SHMEM)
                );
 }