diff options
| author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2011-11-02 13:38:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 16:06:59 -0700 |
| commit | 715a5ee82ab3c07430f748630044354132add5ad (patch) | |
| tree | f77a20fbcd0e19dcb3b65f511194e01e8095bf6a /mm | |
| parent | c0ff4b8540a5c158b8e5bafb7d767298b67b0b92 (diff) | |
| download | op-kernel-dev-715a5ee82ab3c07430f748630044354132add5ad.zip op-kernel-dev-715a5ee82ab3c07430f748630044354132add5ad.tar.gz | |
memcg: fix oom schedule_timeout()
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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 9e38abd..c02d870 100644 --- 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; } |
