diff -NurpP linux-2.6.14-vs2.1.0-rc6.2/include/linux/vserver/limit.h linux-2.6.14-vs2.1.0-rc6.3/include/linux/vserver/limit.h
--- linux-2.6.14-vs2.1.0-rc6.2/include/linux/vserver/limit.h	2005-11-07 04:31:51 +0100
+++ linux-2.6.14-vs2.1.0-rc6.3/include/linux/vserver/limit.h	2005-11-07 05:58:20 +0100
@@ -12,17 +12,19 @@
 #ifdef	__KERNEL__
 
 
+#if	defined(RLIM_INFINITY)
 #define	VLIM_INFINITY	(~0ULL)
 
 #if	(RLIM_INFINITY == VLIM_INFINITY)
-#define	VX_VLIM(v) (v)
-#define	VX_RLIM(v) (v)
+#define	VX_VLIM(v) (unsigned long long)(v)
+#define	VX_RLIM(v) (unsigned long)(v)
 #else
 #define	VX_VLIM(r) (((r) == RLIM_INFINITY) ? \
 		VLIM_INFINITY : (unsigned long long)(r))
 #define	VX_RLIM(v) (((v) == VLIM_INFINITY) ? \
 		RLIM_INFINITY : (unsigned long)(v))
 #endif
+#endif
 
 struct sysinfo;
 
diff -NurpP linux-2.6.14-vs2.1.0-rc6.2/kernel/vserver/limit_proc.h linux-2.6.14-vs2.1.0-rc6.3/kernel/vserver/limit_proc.h
--- linux-2.6.14-vs2.1.0-rc6.2/kernel/vserver/limit_proc.h	2005-11-07 04:33:33 +0100
+++ linux-2.6.14-vs2.1.0-rc6.3/kernel/vserver/limit_proc.h	2005-11-07 05:50:55 +0100
@@ -17,7 +17,7 @@ static inline void vx_limit_fixup(struct
 }
 
 
-#define VX_LIMIT_FMT	":\t%10d\t%10ld\t%10ld\t%6d\n"
+#define VX_LIMIT_FMT	":\t%10d\t%10ld\t%10lld\t%6d\n"
 
 #define VX_LIMIT_ARG(r)				\
 		,atomic_read(&limit->rcur[r])	\