From owner-svn-src-all@freebsd.org  Sun Sep 24 22:29:12 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 97E91E02D34;
 Sun, 24 Sep 2017 22:29:12 +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 56AC9647FD;
 Sun, 24 Sep 2017 22:29:12 +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 v8OMTBP2076512;
 Sun, 24 Sep 2017 22:29:11 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8OMTBcZ076511;
 Sun, 24 Sep 2017 22:29:11 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201709242229.v8OMTBcZ076511@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, 24 Sep 2017 22:29:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323981 - head/sys/contrib/vchiq/interface/vchiq_arm
X-SVN-Group: head
X-SVN-Commit-Author: alc
X-SVN-Commit-Paths: head/sys/contrib/vchiq/interface/vchiq_arm
X-SVN-Commit-Revision: 323981
X-SVN-Commit-Repository: base
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: Sun, 24 Sep 2017 22:29:12 -0000

Author: alc
Date: Sun Sep 24 22:29:11 2017
New Revision: 323981
URL: https://svnweb.freebsd.org/changeset/base/323981

Log:
  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.
  
  MFC after:	1 week

Modified:
  head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c

Modified: head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
==============================================================================
--- head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c	Sun Sep 24 20:57:03 2017	(r323980)
+++ head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c	Sun Sep 24 22:29:11 2017	(r323981)
@@ -378,8 +378,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);
 }