Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 23 Mar 2018 18:24:02 +0000 (UTC)
From:      Jeff Roberson <jeff@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r331450 - head/sys/vm
Message-ID:  <201803231824.w2NIO2EF060735@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jeff
Date: Fri Mar 23 18:24:02 2018
New Revision: 331450
URL: https://svnweb.freebsd.org/changeset/base/331450

Log:
  Fix two compliation problems on non-amd64 architectures.

Modified:
  head/sys/vm/vm_page.c
  head/sys/vm/vm_reserv.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Fri Mar 23 18:20:42 2018	(r331449)
+++ head/sys/vm/vm_page.c	Fri Mar 23 18:24:02 2018	(r331450)
@@ -1783,7 +1783,9 @@ again:
 	 */
 	KASSERT(m != NULL, ("missing page"));
 
+#if VM_NRESERVLEVEL > 0
 found:
+#endif
 	vm_page_alloc_check(m);
 
 	/*

Modified: head/sys/vm/vm_reserv.c
==============================================================================
--- head/sys/vm/vm_reserv.c	Fri Mar 23 18:20:42 2018	(r331449)
+++ head/sys/vm/vm_reserv.c	Fri Mar 23 18:24:02 2018	(r331450)
@@ -419,7 +419,7 @@ vm_reserv_depopulate(vm_reserv_t rv, int index)
 	    index));
 	KASSERT(rv->popcnt > 0,
 	    ("vm_reserv_depopulate: reserv %p's popcnt is corrupted", rv));
-	KASSERT(rv->domain >= 0 && rv->domain < vm_ndomains,
+	KASSERT(rv->domain < vm_ndomains,
 	    ("vm_reserv_depopulate: reserv %p's domain is corrupted %d",
 	    rv, rv->domain));
 	if (rv->popcnt == VM_LEVEL_0_NPAGES) {
@@ -531,7 +531,7 @@ vm_reserv_populate(vm_reserv_t rv, int index)
 	    ("vm_reserv_populate: reserv %p is already full", rv));
 	KASSERT(rv->pages->psind == 0,
 	    ("vm_reserv_populate: reserv %p is already promoted", rv));
-	KASSERT(rv->domain >= 0 && rv->domain < vm_ndomains,
+	KASSERT(rv->domain < vm_ndomains,
 	    ("vm_reserv_populate: reserv %p's domain is corrupted %d",
 	    rv, rv->domain));
 	popmap_set(rv->popmap, index);
@@ -1218,7 +1218,7 @@ vm_reserv_reclaim(vm_reserv_t rv)
 	vm_reserv_domain_lock(rv->domain);
 	KASSERT(rv->inpartpopq,
 	    ("vm_reserv_reclaim: reserv %p's inpartpopq is FALSE", rv));
-	KASSERT(rv->domain >= 0 && rv->domain < vm_ndomains,
+	KASSERT(rv->domain < vm_ndomains,
 	    ("vm_reserv_reclaim: reserv %p's domain is corrupted %d",
 	    rv, rv->domain));
 	TAILQ_REMOVE(&vm_rvq_partpop[rv->domain], rv, partpopq);

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