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] / include / linux / vserver / limit.h

diff --git a/include/linux/vserver/limit.h b/include/linux/vserver/limit.h
index 449a4fc..aaaee11 100644 (file)
--- a/include/linux/vserver/limit.h
+++ b/include/linux/vserver/limit.h
@@ -1,6 +1,12 @@
 #ifndef _VX_LIMIT_H
 #define _VX_LIMIT_H
 
+
+#define VLIMIT_NSOCK   16
+#define VLIMIT_OPENFD  17
+#define VLIMIT_ANON    18
+#define VLIMIT_SHMEM   19
+
 #ifdef __KERNEL__
 
 struct sysinfo;
@@ -8,16 +14,7 @@ struct sysinfo;
 void vx_vsi_meminfo(struct sysinfo *);
 void vx_vsi_swapinfo(struct sysinfo *);
 
-#define VXD_RLIMIT(r,l)                (VXD_CBIT(limit, (l)) && ((r) == (l)))
-
 #define NUM_LIMITS     24
 
-#define VLIMIT_NSOCK   16
-#define VLIMIT_OPENFD  17
-#define VLIMIT_ANON    18
-#define VLIMIT_SHMEM   19
-
-extern const char *vlimit_name[NUM_LIMITS];
-
 #endif /* __KERNEL__ */
 #endif /* _VX_LIMIT_H */