diff --git a/[refs] b/[refs] index 106bb9e3f23f..20bfbd040cd2 100644 --- 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 index 4198e000f41a..46bf2ed5594c 100644 --- 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