svn commit: r291933 - stable/10/sys/vm

[Konstantin Belousov]

Author: kib
Date: Mon Dec  7 11:12:03 2015
New Revision: 291933
URL: https://svnweb.freebsd.org/changeset/base/291933

Log:
  MFC r290915:
  Do not skip a process which has inhibited thread due to the swap-out,
  in the OOM selection loop.

Modified:
  stable/10/sys/vm/vm_pageout.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vm_pageout.c
==============================================================================
--- stable/10/sys/vm/vm_pageout.c	Mon Dec  7 11:04:50 2015	(r291932)
+++ stable/10/sys/vm/vm_pageout.c	Mon Dec  7 11:12:03 2015	(r291933)
@@ -1570,7 +1570,8 @@ vm_pageout_oom(int shortage)
 			if (!TD_ON_RUNQ(td) &&
 			    !TD_IS_RUNNING(td) &&
 			    !TD_IS_SLEEPING(td) &&
-			    !TD_IS_SUSPENDED(td)) {
+			    !TD_IS_SUSPENDED(td) &&
+			    !TD_IS_SWAPPED(td)) {
 				thread_unlock(td);
 				breakout = 1;
 				break;