git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] oom fix: prevent oom from killing a process with children/sibling unkillable
[pandora-kernel.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
b278b8d
..
2f39169
100644
(file)
--- 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);