From owner-svn-src-user@freebsd.org  Fri Mar 23 14:36:25 2018
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8EE3F4C8CC
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 23 Mar 2018 14:36:24 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9549276D19;
 Fri, 23 Mar 2018 14:36:24 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C15021256;
 Fri, 23 Mar 2018 14:36:24 +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 w2NEaO35041275;
 Fri, 23 Mar 2018 14:36:24 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2NEaOhQ041274;
 Fri, 23 Mar 2018 14:36:24 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201803231436.w2NEaOhQ041274@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: Fri, 23 Mar 2018 14:36:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r331424 - user/markj/vm-playground/sys/vm
X-SVN-Group: user
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: user/markj/vm-playground/sys/vm
X-SVN-Commit-Revision: 331424
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Mar 2018 14:36:25 -0000

Author: markj
Date: Fri Mar 23 14:36:24 2018
New Revision: 331424
URL: https://svnweb.freebsd.org/changeset/base/331424

Log:
  Fix a mismerge that resulted in a page leak.

Modified:
  user/markj/vm-playground/sys/vm/vm_page.c

Modified: user/markj/vm-playground/sys/vm/vm_page.c
==============================================================================
--- user/markj/vm-playground/sys/vm/vm_page.c	Fri Mar 23 14:34:41 2018	(r331423)
+++ user/markj/vm-playground/sys/vm/vm_page.c	Fri Mar 23 14:36:24 2018	(r331424)
@@ -3680,7 +3680,6 @@ vm_page_free_toq(vm_page_t m)
 		return;
 
 	domain = vm_phys_domain(m);
-	freed = 0;
 	vmd = VM_DOMAIN(domain);
 
 	critical_enter();
@@ -3694,6 +3693,8 @@ vm_page_free_toq(vm_page_t m)
 	critical_exit();
 
 	vm_domain_free_lock(vmd);
+	vm_phys_free_pages(m, 0);
+	freed = 1;
 	VM_BATCHQ_FOREACH(&bq, m) {
 		vm_phys_free_pages(m, 0);
 		freed++;