From db37c5418fe7f9c4d88fb79cf018009b66f8333f Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Mon, 9 Aug 2010 17:19:36 -0700 Subject: [PATCH] --- yaml --- r: 207255 b: refs/heads/master c: f88ccad5886d5a864b8b0d48c666ee9998dec53f h: refs/heads/master i: 207253: 0b23510cd3aef679ac1dba2637c02a2ad392e6b9 207251: f949ee6f3b5606ad9a1cfd4cf94f9efae02f7caa 207247: 020ac868d9b6fea8388d7c48149a3d9e5bd792b0 v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e128a8f4fa28..dc6e39fa2142 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab290adbaf8f46770f014ea87968de5baca29c30 +refs/heads/master: f88ccad5886d5a864b8b0d48c666ee9998dec53f diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 2c993e47487f..3999747aef48 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -687,7 +687,8 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, check_panic_on_oom(constraint, gfp_mask, order); read_lock(&tasklist_lock); - if (sysctl_oom_kill_allocating_task) { + if (sysctl_oom_kill_allocating_task && + !oom_unkillable_task(current, NULL, nodemask)) { /* * oom_kill_process() needs tasklist_lock held. If it returns * non-zero, current could not be killed so we must fallback to