diff -NurpP --minimal linux-2.6.34-vs2.3.0.36.30.4.pre4/kernel/vserver/Kconfig linux-2.6.34-vs2.3.0.36.30.4.pre5/kernel/vserver/Kconfig
--- linux-2.6.34-vs2.3.0.36.30.4.pre4/kernel/vserver/Kconfig	2010-05-18 18:11:22.000000000 +0200
+++ linux-2.6.34-vs2.3.0.36.30.4.pre5/kernel/vserver/Kconfig	2010-05-22 00:54:16.000000000 +0200
@@ -231,6 +231,15 @@ config	VSERVER_MONITOR_SYNC
 	  This allows you to specify the interval in ticks
 	  when a time sync entry is inserted.
 
+config	VSERVER_LEGACY_MEM
+	bool	"Legacy Memory Limits"
+	default n
+	help
+	  This provides fake memory limits to keep
+	  older tools happy in the face of memory 
+	  cgroups
+
+
 endmenu
 
 
diff -NurpP --minimal linux-2.6.34-vs2.3.0.36.30.4.pre4/kernel/vserver/limit.c linux-2.6.34-vs2.3.0.36.30.4.pre5/kernel/vserver/limit.c
--- linux-2.6.34-vs2.3.0.36.30.4.pre4/kernel/vserver/limit.c	2010-05-21 23:43:49.000000000 +0200
+++ linux-2.6.34-vs2.3.0.36.30.4.pre5/kernel/vserver/limit.c	2010-05-22 00:52:02.000000000 +0200
@@ -23,6 +23,10 @@
 
 
 const char *vlimit_name[NUM_LIMITS] = {
+#ifdef	CONFIG_VSERVER_LEGACY_MEM
+	[RLIMIT_RSS]		= "RSS",
+	[RLIMIT_AS]		= "VM",
+#endif	/* CONFIG_VSERVER_LEGACY_MEM */
 	[RLIMIT_CPU]		= "CPU",
 	[RLIMIT_NPROC]		= "NPROC",
 	[RLIMIT_NOFILE]		= "NOFILE",
@@ -44,8 +48,15 @@ const struct vcmd_ctx_rlimit_mask_v0 vli
 		/* minimum */
 	0
 	,	/* softlimit */
+#ifdef	CONFIG_VSERVER_LEGACY_MEM
+	MASK_ENTRY( RLIMIT_RSS		) |
+#endif	/* CONFIG_VSERVER_LEGACY_MEM */
 	0
 	,       /* maximum */
+#ifdef	CONFIG_VSERVER_LEGACY_MEM
+	MASK_ENTRY( RLIMIT_RSS		) |
+	MASK_ENTRY( RLIMIT_AS		) |
+#endif	/* CONFIG_VSERVER_LEGACY_MEM */
 	MASK_ENTRY( RLIMIT_NPROC	) |
 	MASK_ENTRY( RLIMIT_NOFILE	) |
 	MASK_ENTRY( RLIMIT_LOCKS	) |