diff -NurpP --minimal linux-2.6.32.9-vs2.3.0.36.29.1/kernel/vserver/limit.c linux-2.6.32.9-vs2.3.0.36.29.2/kernel/vserver/limit.c
--- linux-2.6.32.9-vs2.3.0.36.29.1/kernel/vserver/limit.c	2010-02-15 09:28:10.000000000 +0100
+++ linux-2.6.32.9-vs2.3.0.36.29.2/kernel/vserver/limit.c	2010-03-02 21:11:00.000000000 +0100
@@ -267,7 +267,7 @@ int vc_rlimit_stat(struct vx_info *vxi, 
 
 void vx_vsi_meminfo(struct sysinfo *val)
 {
-#ifdef	CGROUP_MEM_RES_CTLR
+#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
 	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
 	u64 res_limit, res_usage;
 
@@ -281,7 +281,7 @@ void vx_vsi_meminfo(struct sysinfo *val)
 		val->totalram = (res_limit >> PAGE_SHIFT);
 	val->freeram = val->totalram - (res_usage >> PAGE_SHIFT);
 	val->bufferram = 0;
-#else
+#else	/* !CONFIG_CGROUP_MEM_RES_CTLR */
 	struct vx_info *vxi = current_vx_info();
 	unsigned long totalram, freeram;
 	rlim_t v;
@@ -296,7 +296,7 @@ void vx_vsi_meminfo(struct sysinfo *val)
 
 	val->totalram = totalram;
 	val->freeram = freeram;
-#endif
+#endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
 	val->totalhigh = 0;
 	val->freehigh = 0;
 	return;
@@ -304,7 +304,7 @@ void vx_vsi_meminfo(struct sysinfo *val)
 
 void vx_vsi_swapinfo(struct sysinfo *val)
 {
-#ifdef	CGROUP_MEM_RES_CTLR_SWAP
+#ifdef	CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
 	u64 res_limit, res_usage, memsw_limit, memsw_usage;
 	s64 swap_limit, swap_usage;
@@ -327,7 +327,7 @@ void vx_vsi_swapinfo(struct sysinfo *val
 	swap_usage = memsw_usage - res_usage;
 	val->freeswap = (swap_usage < swap_limit) ?
 		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
-#else
+#else	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
 	struct vx_info *vxi = current_vx_info();
 	unsigned long totalswap, freeswap;
 	rlim_t v, w;
@@ -351,13 +351,13 @@ void vx_vsi_swapinfo(struct sysinfo *val
 
 	val->totalswap = totalswap;
 	val->freeswap = freeswap;
-#endif
+#endif	/* CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
 	return;
 }
 
 long vx_vsi_cached(struct sysinfo *val)
 {
-#ifdef	CGROUP_MEM_RES_CTLR
+#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
 	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
 
 	return mem_cgroup_stat_read_cache(mcg);