diff -NurpP --minimal linux-3.1.4-vs2.3.2.3/kernel/vserver/Kconfig linux-3.1.4-vs2.3.2.4/kernel/vserver/Kconfig
--- linux-3.1.4-vs2.3.2.3/kernel/vserver/Kconfig	2011-10-24 18:53:33.000000000 +0200
+++ linux-3.1.4-vs2.3.2.4/kernel/vserver/Kconfig	2011-12-07 05:08:42.000000000 +0100
@@ -176,14 +176,6 @@ config	VSERVER_HISTORY_SIZE
 	  This allows you to specify the number of entries in
 	  the per-CPU history buffer.
 
-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
-
 choice
 	prompt	"Quotes used in debug and warn messages"
 	default	QUOTES_ISO8859
diff -NurpP --minimal linux-3.1.4-vs2.3.2.3/kernel/vserver/limit.c linux-3.1.4-vs2.3.2.4/kernel/vserver/limit.c
--- linux-3.1.4-vs2.3.2.3/kernel/vserver/limit.c	2011-12-07 04:10:54.000000000 +0100
+++ linux-3.1.4-vs2.3.2.4/kernel/vserver/limit.c	2011-12-07 05:08:10.000000000 +0100
@@ -23,10 +23,6 @@
 
 
 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",
@@ -48,15 +44,8 @@ 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	) |