Commit 715a5ee8 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds

memcg: fix oom schedule_timeout()

Before calling schedule_timeout(), task state should be changed.
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c0ff4b85
...@@ -1898,7 +1898,7 @@ bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask) ...@@ -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)) if (test_thread_flag(TIF_MEMDIE) || fatal_signal_pending(current))
return false; return false;
/* Give chance to dying process */ /* Give chance to dying process */
schedule_timeout(1); schedule_timeout_uninterruptible(1);
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment