---

yaml --- r: 320790 b: refs/heads/master c: 121d1ba h: refs/heads/master v: v3
git-mirror · Aug 1, 2012 · 275ec27 · 275ec27
1 parent 5719dad
commit 275ec27
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: 2a13515c398bbe471bf64519ada87fd708152ced
+refs/heads/master: 121d1ba0a019e1465a53533aea133b1b0f6b442d
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -719,9 +719,9 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
 	check_panic_on_oom(constraint, gfp_mask, order, mpol_mask);
 
 	read_lock(&tasklist_lock);
-	if (sysctl_oom_kill_allocating_task &&
+	if (sysctl_oom_kill_allocating_task && current->mm &&
 	    !oom_unkillable_task(current, NULL, nodemask) &&
-	    current->mm) {
+	    current->signal->oom_score_adj != OOM_SCORE_ADJ_MIN) {
 		oom_kill_process(current, gfp_mask, order, 0, totalpages, NULL,
 				 nodemask,
 				 "Out of memory (oom_kill_allocating_task)");