1 files changed, 7 insertions, 3 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ea5f5edf00b7..f52b0a1861c4 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -47,6 +47,7 @@
 #include <linux/mm_inline.h>
 #include <linux/page_cgroup.h>
 #include <linux/cpu.h>
+#include <linux/oom.h>
 #include "internal.h"
 
 #include <asm/uaccess.h>
@@ -838,10 +839,13 @@ int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem)
 {
         int ret;
         struct mem_cgroup *curr = NULL;
+        struct task_struct *p;
 
-        task_lock(task);
-        curr = try_get_mem_cgroup_from_mm(task->mm);
-        task_unlock(task);
+        p = find_lock_task_mm(task);
+        if (!p)
+                return 0;
+        curr = try_get_mem_cgroup_from_mm(p->mm);
+        task_unlock(p);
         if (!curr)
                 return 0;
         /*