diff options
author | Alex Elder <aelder@sgi.com> | 2010-02-26 14:34:02 -0600 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-02-26 14:34:02 -0600 |
commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /mm/oom_kill.c | |
parent | d67b1b03254c501fef371b0e5916c94a52bfc2c5 (diff) | |
parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
download | kernel_goldelico_gta04-398007f863a4af2b4a5a07219c5a617f1a098115.zip kernel_goldelico_gta04-398007f863a4af2b4a5a07219c5a617f1a098115.tar.gz kernel_goldelico_gta04-398007f863a4af2b4a5a07219c5a617f1a098115.tar.bz2 |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index f52481b..2370504 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -459,6 +459,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, list_for_each_entry(c, &p->children, sibling) { if (c->mm == p->mm) continue; + if (mem && !task_in_mem_cgroup(c, mem)) + continue; if (!oom_kill_task(c)) return 0; } |