Commit 715a5ee8 authored Nov 02, 2011 by KAMEZAWA Hiroyuki Committed by Linus Torvalds Nov 02, 2011

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>

parent c0ff4b85

mm/memcontrol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}