projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] cpuset: numa_policy_rebind cleanup
[powerpc.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
d348b90
..
4748b90
100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-298,7
+298,8
@@
retry:
/*
* Give "p" a good chance of killing itself before we
/*
* Give "p" a good chance of killing itself before we
- * retry to allocate memory
.
+ * retry to allocate memory
unless "p" is current
*/
*/
- schedule_timeout_interruptible(1);
+ if (!test_thread_flag(TIF_MEMDIE))
+ schedule_timeout_interruptible(1);
}
}