projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0ff4b8
)
memcg: fix oom schedule_timeout()
author
KAMEZAWA Hiroyuki
<kamezawa.hiroyu@jp.fujitsu.com>
Wed, 2 Nov 2011 20:38:18 +0000
(13:38 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 2 Nov 2011 23:06:59 +0000
(16:06 -0700)
Before calling schedule_timeout(), task state should be changed.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/memcontrol.c
patch
|
blob
|
history
diff --git
a/mm/memcontrol.c
b/mm/memcontrol.c
index
9e38abd
..
c02d870
100644
(file)
--- a/
mm/memcontrol.c
+++ b/
mm/memcontrol.c
@@
-1898,7
+1898,7
@@
bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask)
if (test_thread_flag(TIF_MEMDIE) || fatal_signal_pending(current))
return false;
/* Give chance to dying process */
- schedule_timeout(1);
+ schedule_timeout
_uninterruptible
(1);
return true;
}