Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[deliverable/linux.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 0399f146ae49900a92c52ea158823cef1ad18ff2..79e451a78c9ee342fea259d58c5ca1c0034ada2a 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -386,8 +386,10 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
        cpuset_print_task_mems_allowed(current);
        task_unlock(current);
        dump_stack();
-       mem_cgroup_print_oom_info(memcg, p);
-       show_mem(SHOW_MEM_FILTER_NODES);
+       if (memcg)
+               mem_cgroup_print_oom_info(memcg, p);
+       else
+               show_mem(SHOW_MEM_FILTER_NODES);
        if (sysctl_oom_dump_tasks)
                dump_tasks(memcg, nodemask);
 }