diff -NurpP linux-4.1.18-vs2.3.8.5/kernel/vserver/limit.c linux-4.1.18-vs2.3.8.5.1/kernel/vserver/limit.c --- linux-4.1.18-vs2.3.8.5/kernel/vserver/limit.c 2016-02-21 00:00:54.000000000 +0000 +++ linux-4.1.18-vs2.3.8.5.1/kernel/vserver/limit.c 2016-02-21 16:53:01.000000000 +0000 @@ -257,7 +257,6 @@ int vc_rlimit_stat(struct vx_info *vxi, void vx_vsi_meminfo(struct sysinfo *val) { -#ifdef CONFIG_MEMCG_BROKEN struct mem_cgroup *mcg; u64 res_limit, res_usage; @@ -267,8 +266,8 @@ void vx_vsi_meminfo(struct sysinfo *val) if (!mcg) goto out; - // res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); - // res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); + res_limit = mem_cgroup_mem_limit(mcg); + res_usage = mem_cgroup_mem_usage(mcg); if (res_limit != PAGE_COUNTER_MAX) val->totalram = (res_limit >> PAGE_SHIFT); @@ -277,7 +276,6 @@ void vx_vsi_meminfo(struct sysinfo *val) val->totalhigh = 0; val->freehigh = 0; out: -#endif /* CONFIG_MEMCG */ return; }