From owner-svn-src-head@freebsd.org Thu Jul 5 17:26:14 2018 Return-Path: Delivered-To: svn-src-head@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 691F310400E5; Thu, 5 Jul 2018 17:26:14 +0000 (UTC) (envelope-from kib@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 12DAF8B084; Thu, 5 Jul 2018 17:26:14 +0000 (UTC) (envelope-from kib@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 E807C1D008; Thu, 5 Jul 2018 17:26:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w65HQDxY070191; Thu, 5 Jul 2018 17:26:13 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w65HQDWf070190; Thu, 5 Jul 2018 17:26:13 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201807051726.w65HQDWf070190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 5 Jul 2018 17:26:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336008 - in head/sys: amd64/amd64 i386/i386 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys: amd64/amd64 i386/i386 X-SVN-Commit-Revision: 336008 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 17:26:14 -0000 Author: kib Date: Thu Jul 5 17:26:13 2018 New Revision: 336008 URL: https://svnweb.freebsd.org/changeset/base/336008 Log: Revert r335999 to re-commit with the correct error message. Modified: head/sys/amd64/amd64/pmap.c head/sys/i386/i386/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Thu Jul 5 17:13:37 2018 (r336007) +++ head/sys/amd64/amd64/pmap.c Thu Jul 5 17:26:13 2018 (r336008) @@ -2308,6 +2308,7 @@ retry: PG_PS_FRAME) | (va & PDRMASK), &pa)) goto retry; m = PHYS_TO_VM_PAGE(pa); + vm_page_hold(m); } } else { pte = *pmap_pde_to_pte(pdep, va); @@ -2317,10 +2318,10 @@ retry: &pa)) goto retry; m = PHYS_TO_VM_PAGE(pa); + if (m != NULL) + vm_page_hold(m); } } - if (m != NULL) - vm_page_hold(m); } PA_UNLOCK_COND(pa); PMAP_UNLOCK(pmap); Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Thu Jul 5 17:13:37 2018 (r336007) +++ head/sys/i386/i386/pmap.c Thu Jul 5 17:26:13 2018 (r336008) @@ -1673,6 +1673,7 @@ retry: PG_PS_FRAME) | (va & PDRMASK), &pa)) goto retry; m = PHYS_TO_VM_PAGE(pa); + vm_page_hold(m); } } else { pte = pmap_pte_ufast(pmap, va, pde); @@ -1682,10 +1683,10 @@ retry: &pa)) goto retry; m = PHYS_TO_VM_PAGE(pa); + if (m != NULL) + vm_page_hold(m); } } - if (m != NULL) - vm_page_hold(m); } PA_UNLOCK_COND(pa); PMAP_UNLOCK(pmap);