Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 20 Dec 2019 20:46:27 +0000 (UTC)
From:      Alan Cox <alc@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r355946 - in head/sys: amd64/amd64 arm64/arm64
Message-ID:  <201912202046.xBKKkRYR073925@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: alc
Date: Fri Dec 20 20:46:26 2019
New Revision: 355946
URL: https://svnweb.freebsd.org/changeset/base/355946

Log:
  Correct a mistakenly inverted condition in r355833.
  
  Noticed by:	kib
  X-MFC with:	r355833

Modified:
  head/sys/amd64/amd64/pmap.c
  head/sys/arm64/arm64/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Fri Dec 20 20:46:11 2019	(r355945)
+++ head/sys/amd64/amd64/pmap.c	Fri Dec 20 20:46:26 2019	(r355946)
@@ -6336,7 +6336,7 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t
 		    ("pmap_enter_pde: pdpg's reference count is too low"));
 		if ((flags & PMAP_ENTER_NOREPLACE) != 0 && (va <
 		    VM_MAXUSER_ADDRESS || (oldpde & PG_PS) != 0 ||
-		    pmap_every_pte_zero(oldpde & PG_FRAME))) {
+		    !pmap_every_pte_zero(oldpde & PG_FRAME))) {
 			if (pdpg != NULL)
 				pdpg->ref_count--;
 			CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx"

Modified: head/sys/arm64/arm64/pmap.c
==============================================================================
--- head/sys/arm64/arm64/pmap.c	Fri Dec 20 20:46:11 2019	(r355945)
+++ head/sys/arm64/arm64/pmap.c	Fri Dec 20 20:46:26 2019	(r355946)
@@ -3644,7 +3644,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t 
 		    ("pmap_enter_l2: l2pg's ref count is too low"));
 		if ((flags & PMAP_ENTER_NOREPLACE) != 0 && (va <
 		    VM_MAXUSER_ADDRESS || (old_l2 & ATTR_DESCR_MASK) ==
-		    L2_BLOCK || pmap_every_pte_zero(old_l2 & ~ATTR_MASK))) {
+		    L2_BLOCK || !pmap_every_pte_zero(old_l2 & ~ATTR_MASK))) {
 			if (l2pg != NULL)
 				l2pg->ref_count--;
 			CTR2(KTR_PMAP, "pmap_enter_l2: failure for va %#lx"

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912202046.xBKKkRYR073925>