From owner-svn-src-all@freebsd.org  Thu May 25 01:15:54 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5094D80618;
 Thu, 25 May 2017 01:15:54 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A6B0E1AF0;
 Thu, 25 May 2017 01:15:54 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4P1Frie024642;
 Thu, 25 May 2017 01:15:53 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4P1FrNd024640;
 Thu, 25 May 2017 01:15:53 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201705250115.v4P1FrNd024640@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 25 May 2017 01:15:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r318847 - in stable/11/sys: dev/drm2/ttm kern
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 May 2017 01:15:54 -0000

Author: markj
Date: Thu May 25 01:15:53 2017
New Revision: 318847
URL: https://svnweb.freebsd.org/changeset/base/318847

Log:
  MFC r318476, r318478:
  Fix up some kern_yield() usages.

Modified:
  stable/11/sys/dev/drm2/ttm/ttm_bo_vm.c
  stable/11/sys/kern/kern_fail.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/drm2/ttm/ttm_bo_vm.c
==============================================================================
--- stable/11/sys/dev/drm2/ttm/ttm_bo_vm.c	Thu May 25 01:14:34 2017	(r318846)
+++ stable/11/sys/dev/drm2/ttm/ttm_bo_vm.c	Thu May 25 01:15:53 2017	(r318847)
@@ -126,7 +126,7 @@ reserve:
 	ret = ttm_bo_reserve(bo, false, false, false, 0);
 	if (unlikely(ret != 0)) {
 		if (ret == -EBUSY) {
-			kern_yield(0);
+			kern_yield(PRI_USER);
 			goto reserve;
 		}
 	}
@@ -139,7 +139,7 @@ reserve:
 		case -EBUSY:
 		case -ERESTARTSYS:
 		case -EINTR:
-			kern_yield(0);
+			kern_yield(PRI_USER);
 			goto reserve;
 		default:
 			retval = VM_PAGER_ERROR;

Modified: stable/11/sys/kern/kern_fail.c
==============================================================================
--- stable/11/sys/kern/kern_fail.c	Thu May 25 01:14:34 2017	(r318846)
+++ stable/11/sys/kern/kern_fail.c	Thu May 25 01:15:53 2017	(r318847)
@@ -612,7 +612,7 @@ fail_point_eval_nontrivial(struct fail_p
 			break;
 
 		case FAIL_POINT_YIELD:
-			kern_yield(-1);
+			kern_yield(PRI_UNCHANGED);
 			break;
 
 		case FAIL_POINT_DELAY: