diff -NurpP --minimal linux-2.6.14-vs2.1.0-rc6.3/include/linux/vserver/limit.h linux-2.6.14-vs2.1.0-rc6.4/include/linux/vserver/limit.h
--- linux-2.6.14-vs2.1.0-rc6.3/include/linux/vserver/limit.h	2005-11-07 05:58:20 +0100
+++ linux-2.6.14-vs2.1.0-rc6.4/include/linux/vserver/limit.h	2005-11-08 00:34:57 +0100
@@ -11,8 +11,8 @@
 
 #ifdef	__KERNEL__
 
+/* 	keep in sync with CRLIM_INFINITY */
 
-#if	defined(RLIM_INFINITY)
 #define	VLIM_INFINITY	(~0ULL)
 
 #if	(RLIM_INFINITY == VLIM_INFINITY)
@@ -24,7 +24,6 @@
 #define	VX_RLIM(v) (((v) == VLIM_INFINITY) ? \
 		RLIM_INFINITY : (unsigned long)(v))
 #endif
-#endif
 
 struct sysinfo;
 
diff -NurpP --minimal linux-2.6.14-vs2.1.0-rc6.3/include/linux/vserver/limit_cmd.h linux-2.6.14-vs2.1.0-rc6.4/include/linux/vserver/limit_cmd.h
--- linux-2.6.14-vs2.1.0-rc6.3/include/linux/vserver/limit_cmd.h	2005-11-07 04:32:14 +0100
+++ linux-2.6.14-vs2.1.0-rc6.4/include/linux/vserver/limit_cmd.h	2005-11-08 00:29:46 +0100
@@ -21,7 +21,7 @@ struct	vcmd_ctx_rlimit_mask_v0 {
 };
 
 #define CRLIM_UNSET		(0ULL)
-#define CRLIM_INFINITY		VLIM_INFINITY	
+#define CRLIM_INFINITY		(~0ULL)
 #define CRLIM_KEEP		(~1ULL)
 
 #ifdef	__KERNEL__