The patch titled
oom fix: prevent oom from killing a process with children/sibling unkillable
has been removed from the -mm tree. Its filename was
oom-fix-prevent-oom-from-killing-a-process-with-children-sibling-unkillable.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: oom fix: prevent oom from killing a process with children/sibling unkillable
From: Ankita Garg <ankita@xxxxxxxxxx>
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@xxxxxxxxxx>
Acked-by: Nick Piggin <npiggin@xxxxxxx>
Acked-by: William Irwin <wli@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/oom_kill.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/oom_kill.c~oom-fix-prevent-oom-from-killing-a-process-with-children-sibling-unkillable mm/oom_kill.c
--- a/mm/oom_kill.c~oom-fix-prevent-oom-from-killing-a-process-with-children-sibling-unkillable
+++ a/mm/oom_kill.c
@@ -320,7 +320,7 @@ static int oom_kill_task(struct task_str
* 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);
_
Patches currently in -mm which might be from ankita@xxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
