diff -NurpP --minimal linux-4.1.35-vs2.3.8.5.2/include/linux/vserver/limit.h linux-4.1.35-vs2.3.8.5.3/include/linux/vserver/limit.h --- linux-4.1.35-vs2.3.8.5.2/include/linux/vserver/limit.h 2016-07-05 04:41:47.000000000 +0000 +++ linux-4.1.35-vs2.3.8.5.3/include/linux/vserver/limit.h 2016-11-12 13:56:54.000000000 +0000 @@ -52,9 +52,15 @@ typedef unsigned long rlim_t; struct sysinfo; +#ifdef CONFIG_MEMCG void vx_vsi_meminfo(struct sysinfo *); void vx_vsi_swapinfo(struct sysinfo *); long vx_vsi_cached(struct sysinfo *); +#else /* !CONFIG_MEMCG */ +#define vx_vsi_meminfo(s) do { } while (0) +#define vx_vsi_swapinfo(s) do { } while (0) +#define vx_vsi_cached(s) (0L) +#endif /* !CONFIG_MEMCG */ #define NUM_LIMITS 24 diff -NurpP --minimal linux-4.1.35-vs2.3.8.5.2/kernel/vserver/limit.c linux-4.1.35-vs2.3.8.5.3/kernel/vserver/limit.c --- linux-4.1.35-vs2.3.8.5.2/kernel/vserver/limit.c 2016-07-06 05:40:59.000000000 +0000 +++ linux-4.1.35-vs2.3.8.5.3/kernel/vserver/limit.c 2016-11-12 12:58:54.000000000 +0000 @@ -255,6 +255,7 @@ int vc_rlimit_stat(struct vx_info *vxi, } +#ifdef CONFIG_MEMCG void vx_vsi_meminfo(struct sysinfo *val) { struct mem_cgroup *mcg; @@ -338,4 +339,5 @@ out: #endif return cache; } +#endif /* !CONFIG_MEMCG */