---

yaml --- r: 295265 b: refs/heads/master c: d2d3930 h: refs/heads/master i: 295263: 7f3f451 v: v3
git-mirror · Mar 23, 2012 · 8a2f873 · 8a2f873
1 parent 423d9dd
commit 8a2f873
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: def8cf72562e17ec8316ce0cb5697c7afd6400e3
+refs/heads/master: d2d393099de21eda91c5ec6a05d60e5dee4d5175
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -521,11 +521,11 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 			pr_err("Kill process %d (%s) sharing same memory\n",
 				task_pid_nr(p), p->comm);
 			task_unlock(p);
-			force_sig(SIGKILL, p);
+			do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
 		}
 
 	set_tsk_thread_flag(victim, TIF_MEMDIE);
-	force_sig(SIGKILL, victim);
+	do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
 }
 #undef K