diff -u linux-3.6.10-vs2.3.4.5/kernel/vserver/limit.c linux-3.6.10-vs2.3.4.5.1/kernel/vserver/limit.c
--- linux-3.6.10-vs2.3.4.5/kernel/vserver/limit.c	2012-10-04 18:47:00.000000000 +0200
+++ linux-3.6.10-vs2.3.4.5.1/kernel/vserver/limit.c	2012-12-12 11:48:07.000000000 +0000
@@ -257,7 +257,7 @@
 
 void vx_vsi_meminfo(struct sysinfo *val)
 {
-#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
+#ifdef	CONFIG_MEMCG
 	struct mem_cgroup *mcg;
 	u64 res_limit, res_usage;
 
@@ -277,14 +277,14 @@
 	val->totalhigh = 0;
 	val->freehigh = 0;
 out:
-#endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
+#endif	/* CONFIG_MEMCG */
 	return;
 }
 
 void vx_vsi_swapinfo(struct sysinfo *val)
 {
-#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
-#ifdef	CONFIG_CGROUP_MEM_RES_CTLR_SWAP
+#ifdef	CONFIG_MEMCG
+#ifdef	CONFIG_MEMCG_SWAP
 	struct mem_cgroup *mcg;
 	u64 res_limit, res_usage, memsw_limit, memsw_usage;
 	s64 swap_limit, swap_usage;
@@ -317,18 +317,18 @@
 	val->freeswap = (swap_usage < swap_limit) ?
 		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
 out:
-#else	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
+#else	/* !CONFIG_MEMCG_SWAP */
 	val->totalswap = 0;
 	val->freeswap = 0;
-#endif	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
-#endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
+#endif	/* !CONFIG_MEMCG_SWAP */
+#endif	/* CONFIG_MEMCG */
 	return;
 }
 
 long vx_vsi_cached(struct sysinfo *val)
 {
 	long cache = 0;
-#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
+#ifdef	CONFIG_MEMCG
 	struct mem_cgroup *mcg;
 
 	rcu_read_lock();
diff -u linux-3.6.10-vs2.3.4.5/kernel/vserver/vci_config.h linux-3.6.10-vs2.3.4.5.1/kernel/vserver/vci_config.h
--- linux-3.6.10-vs2.3.4.5/kernel/vserver/vci_config.h	2012-10-04 18:47:00.000000000 +0200
+++ linux-3.6.10-vs2.3.4.5.1/kernel/vserver/vci_config.h	2012-12-12 11:49:11.000000000 +0000
@@ -17,6 +17,7 @@
 	VCI_KCBIT_SPACES = 10,
 	VCI_KCBIT_NETV2 = 11,
 	VCI_KCBIT_MEMCG = 12,
+	VCI_KCBIT_SWAP = 13,
 
 	VCI_KCBIT_DEBUG = 16,
 	VCI_KCBIT_HISTORY = 20,
@@ -42,9 +43,12 @@
 #endif
 	(1 << VCI_KCBIT_SPACES) |
 	(1 << VCI_KCBIT_NETV2) |
-#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
+#ifdef	CONFIG_MEMCG
 	(1 << VCI_KCBIT_MEMCG) |
 #endif
+#ifdef	CONFIG_MEMCG_SWAP
+	(1 << VCI_KCBIT_SWAP) |
+#endif
 
 	/* debug options */
 #ifdef	CONFIG_VSERVER_DEBUG