Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 715a5ee82ab3c07430f748630044354132add5ad

Authored by KAMEZAWA Hiroyuki
Committed by Linus Torvalds
1 parent c0ff4b8540
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -1898,7 +1898,7 @@
1898 1898 if (test_thread_flag(TIF_MEMDIE) || fatal_signal_pending(current))
1899 1899 return false;
1900 1900 /* Give chance to dying process */
1901   - schedule_timeout(1);
  1901 + schedule_timeout_uninterruptible(1);
1902 1902 return true;
1903 1903 }
1904 1904