1 files changed, 9 insertions, 7 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index f227786e73db..c3f09b2dda5f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1442,15 +1442,17 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
         struct mem_cgroup *iter;
         unsigned int i;
 
-        if (!p)
-                return;
-
         mutex_lock(&oom_info_lock);
         rcu_read_lock();
 
-        pr_info("Task in ");
-        pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id));
-        pr_cont(" killed as a result of limit of ");
+        if (p) {
+                pr_info("Task in ");
+                pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id));
+                pr_cont(" killed as a result of limit of ");
+        } else {
+                pr_info("Memory limit reached of cgroup ");
+        }
+
         pr_cont_cgroup_path(memcg->css.cgroup);
         pr_cont("\n");
 
@@ -1537,7 +1539,7 @@ static void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
                 return;
         }
 
-        check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL);
+        check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL, memcg);
         totalpages = mem_cgroup_get_limit(memcg) ? : 1;
         for_each_mem_cgroup_tree(iter, memcg) {
                 struct css_task_iter it;