[Devel] [RFC 38/54] show_mem: fix CONFIG_VE=n build

[Eva Kurchatova]

Signed-off-by: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
---
 mm/show_mem.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mm/show_mem.c b/mm/show_mem.c
index 0453e3c635eb..4e79ca1ce9c2 100644
--- a/mm/show_mem.c
+++ b/mm/show_mem.c
@@ -93,6 +93,7 @@ EXPORT_SYMBOL(si_meminfo);
 
 void si_meminfo_ve(struct sysinfo *si, struct ve_struct *ve)
 {
+#ifdef CONFIG_VE
 	unsigned long memtotal, memused, swaptotal, swapused;
 	struct mem_cgroup *memcg;
 	struct cgroup_subsys_state *css;
@@ -136,6 +137,14 @@ void si_meminfo_ve(struct sysinfo *si, struct ve_struct *ve)
 	css_put(css);
 
 	/* bufferram, totalhigh and freehigh left 0 */
+#else
+	/*
+	 * Obtain meminfo from host as safeguard,
+	 * however the callers ideally should check VE presence
+	 */
+	(void)ve;
+	return si_meminfo(si);
+#endif
 }
 EXPORT_SYMBOL(si_meminfo_ve);
 
-- 
2.54.0