---

yaml --- r: 88346 b: refs/heads/master c: e115f2d h: refs/heads/master v: v3
git-mirror · Apr 16, 2008 · a28aeaa · a28aeaa
1 parent 9451aca
commit a28aeaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e169c139642fb4c682ec12a409725508dbefa520
+refs/heads/master: e115f2d89253490fb2dbf304b627f8d908df26f1
diff --git a/trunk/mm/oom_kill.c b/trunk/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 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
 				"Memory cgroup out of memory"))
 		goto retry;
 out:
-	rcu_read_unlock();
+	read_unlock(&tasklist_lock);
 	cgroup_unlock();
 }
 #endif