The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-123.1.2.vz7.4.10 ------> commit ae181d3fd3012765dd6e6671d258f6fbe2745eea Author: Kir Kolyshkin <k...@openvz.org> Date: Thu May 7 20:28:19 2015 +0400
ve/proc/meminfo.c: use mm_ub() macro This was found while tring to compile the kernel with a stock config (i.e. no CONFIG_BEANCOUNTERS, CONFIG_VE etc.) and boot it on IBM Power8. ============================================================= Fixes compilation with !CONFIG_BEANCOUNTERS. Signed-off-by: Kir Kolyshkin <k...@openvz.org> --- fs/proc/meminfo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index c70b77b..e352241 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -16,6 +16,7 @@ #include <linux/vmalloc.h> #include <asm/page.h> #include <asm/pgtable.h> +#include <bc/beancounter.h> #include "internal.h" void __attribute__((weak)) arch_report_meminfo(struct seq_file *m) @@ -277,7 +278,7 @@ int meminfo_proc_show_ub(struct seq_file *m, void *v, static int meminfo_proc_show(struct seq_file *m, void *v) { - return meminfo_proc_show_ub(m, v, current->mm->mm_ub, + return meminfo_proc_show_ub(m, v, mm_ub(current->mm), get_exec_env()->meminfo_val); } _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel