Commit 35ae834f authored Mar 16, 2007 by Ankita Garg Committed by Linus Torvalds Mar 16, 2007

[PATCH] 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>
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>

parent e5d480ff

mm/oom_kill.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message