aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnkita Garg <ankita@in.ibm.com>2007-03-18 18:54:14 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-03-23 12:49:26 -0700
commit86fef703b93a7337ec932f12ca23ae365cb730a2 (patch)
treeca198c1d73ce62b646d512e40bddb17a8ca9ef3e
parent0a67204c5d11aca00fafc3ebe95be9a72447f70c (diff)
downloadlinux-linaro-stable-86fef703b93a7337ec932f12ca23ae365cb730a2.tar.gz
oom fix: prevent oom from killing a process with children/sibling unkillable
Looking at oom_kill.c, found that the intention to not kill the selected process if any of its children/siblings has OOM_DISABLE set, is not being met. Signed-off-by: Ankita Garg <ankita@in.ibm.com> Cc: Chuck Ebbert <cebbert@redhat.com> Acked-by: Nick Piggin <npiggin@suse.de> Acked-by: William Irwin <wli@holomorphy.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--mm/oom_kill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b278b8d60eee..2f3916986abf 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -320,7 +320,7 @@ static int oom_kill_task(struct task_struct *p)
* Don't kill the process if any threads are set to OOM_DISABLE
*/
do_each_thread(g, q) {
- if (q->mm == mm && p->oomkilladj == OOM_DISABLE)
+ if (q->mm == mm && q->oomkilladj == OOM_DISABLE)
return 1;
} while_each_thread(g, q);