From owner-svn-src-stable@freebsd.org  Sun Oct  1 16:29:22 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 2BFB6E2899E;
 Sun,  1 Oct 2017 16:29:22 +0000 (UTC) (envelope-from alc@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 EE95C657CB;
 Sun,  1 Oct 2017 16:29:21 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v91GTL2p028974;
 Sun, 1 Oct 2017 16:29:21 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v91GTL45028973;
 Sun, 1 Oct 2017 16:29:21 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201710011629.v91GTL45028973@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org
 using -f
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 1 Oct 2017 16:29:21 +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: r324165 - stable/11/sys/contrib/vchiq/interface/vchiq_arm
X-SVN-Group: stable-11
X-SVN-Commit-Author: alc
X-SVN-Commit-Paths: stable/11/sys/contrib/vchiq/interface/vchiq_arm
X-SVN-Commit-Revision: 324165
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Oct 2017 16:29:22 -0000

Author: alc
Date: Sun Oct  1 16:29:20 2017
New Revision: 324165
URL: https://svnweb.freebsd.org/changeset/base/324165

Log:
  MFC r323981
    Modernize the use of vm_page_unwire().  Since r288122, vm_page_unwire()
    has returned TRUE when the wire count transitions to zero, eliminating
    the need for callers to inspect the page's wire count.

Modified:
  stable/11/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
==============================================================================
--- stable/11/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c	Sun Oct  1 16:25:14 2017	(r324164)
+++ stable/11/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c	Sun Oct  1 16:29:20 2017	(r324165)
@@ -379,8 +379,7 @@ static void
 pagelist_page_free(vm_page_t pp)
 {
 	vm_page_lock(pp);
-	vm_page_unwire(pp, PQ_INACTIVE);
-	if (pp->wire_count == 0 && pp->object == NULL)
+	if (vm_page_unwire(pp, PQ_INACTIVE) && pp->object == NULL)
 		vm_page_free(pp);
 	vm_page_unlock(pp);
 }