[PATCH] mm, debug: mm-introduce-vm_bug_on_mm-fix.patch

From: Michal Hocko
Date: Tue Sep 23 2014 - 05:25:57 EST


dump_mm wants to dump mm->owner even when CONFIG_MEMCG is not defined
which leads to a compilation error:
mm/debug.c: In function âdump_mmâ:
mm/debug.c:212:5: error: âconst struct mm_structâ has no member named âownerâ
mm->owner, mm->exe_file,

Signed-off-by: Michal Hocko <mhocko@xxxxxxx>
---
mm/debug.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mm/debug.c b/mm/debug.c
index 281abb2edddd..63aba9dcfb4e 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -181,7 +181,10 @@ void dump_mm(const struct mm_struct *mm)
#ifdef CONFIG_AIO
"ioctx_table %p\n"
#endif
- "owner %p exe_file %p\n"
+#ifdef CONFIG_MEMCG
+ "owner %p "
+#endif
+ "exe_file %p\n"
#ifdef CONFIG_MMU_NOTIFIER
"mmu_notifier_mm %p\n"
#endif
@@ -209,7 +212,10 @@ void dump_mm(const struct mm_struct *mm)
#ifdef CONFIG_AIO
mm->ioctx_table,
#endif
- mm->owner, mm->exe_file,
+#ifdef CONFIG_MEMCG
+ mm->owner,
+#endif
+ mm->exe_file,
#ifdef CONFIG_MMU_NOTIFIER
mm->mmu_notifier_mm,
#endif
--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/