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
Merge branch 'writeback-for-linus' of git://github.com/fengguang/linux
[pandora-kernel.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
eafff89
..
626303b
100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-303,7
+303,7
@@
static struct task_struct *select_bad_process(unsigned int *ppoints,
do_each_thread(g, p) {
unsigned int points;
do_each_thread(g, p) {
unsigned int points;
- if (
!p->mm
)
+ if (
p->exit_state
)
continue;
if (oom_unkillable_task(p, mem, nodemask))
continue;
continue;
if (oom_unkillable_task(p, mem, nodemask))
continue;
@@
-319,6
+319,8
@@
static struct task_struct *select_bad_process(unsigned int *ppoints,
*/
if (test_tsk_thread_flag(p, TIF_MEMDIE))
return ERR_PTR(-1UL);
*/
if (test_tsk_thread_flag(p, TIF_MEMDIE))
return ERR_PTR(-1UL);
+ if (!p->mm)
+ continue;
if (p->flags & PF_EXITING) {
/*
if (p->flags & PF_EXITING) {
/*