Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index f255eda693b0..beb592fe9389 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -423,7 +423,7 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
         struct task_struct *p;
 
         cgroup_lock();
-        rcu_read_lock();
+        read_lock(&tasklist_lock);
 retry:
         p = select_bad_process(&points, mem);
         if (PTR_ERR(p) == -1UL)
@@ -436,7 +436,7 @@ retry:
                                 "Memory cgroup out of memory"))
                 goto retry;
 out:
-        rcu_read_unlock();
+        read_unlock(&tasklist_lock);
         cgroup_unlock();
 }
 #endif