diff -rNu sys.clean/sys/systm.h sys/sys/systm.h
--- sys.clean/sys/systm.h	2016-11-04 07:44:37.000000000 +0000
+++ sys/sys/systm.h	2016-11-03 13:14:08.000000000 +0000
@@ -82,7 +82,7 @@
 extern int selwait;		/* select timeout address */
 
 extern int maxmem;		/* max memory per process */
-extern int physmem;		/* physical memory */
+extern psize_t physmem;		/* physical memory */
 
 extern dev_t dumpdev;		/* dump device */
 extern dev_t dumpcdev;		/* dump device (character equivalent) */
diff -rNu sys.clean/uvm/pmap/pmap.c sys/uvm/pmap/pmap.c
--- sys.clean/uvm/pmap/pmap.c	2016-11-04 07:49:12.000000000 +0000
+++ sys/uvm/pmap/pmap.c	2016-11-04 07:26:05.000000000 +0000
@@ -470,19 +470,19 @@
 		if (uvm.page_init_done == true)
 			panic("pmap_steal_memory: called _after_ bootstrap");
 
-		aprint_debug("%s: seg %u: %#"PRIxPADDR" %#"PRIxPADDR" %#"PRIxPADDR" %#"PRIxPADDR"\n",
+		aprint_debug("%s: seg %p: %#"PRIxPADDR" %#"PRIxPADDR" %#"PRIxPADDR" %#"PRIxPADDR"\n",
 		    __func__, bank,
-		    uvm_physmem_get_avail_start(bank),uvm_physmem_get_start(bank),
+		    uvm_physmem_get_avail_start(bank), uvm_physmem_get_start(bank),
 		    uvm_physmem_get_avail_end(bank), uvm_physmem_get_end(bank));
 
 		if (uvm_physmem_get_avail_start(bank) != uvm_physmem_get_start(bank)
 		    || uvm_physmem_get_avail_start(bank) >= uvm_physmem_get_avail_end(bank)) {
-			aprint_debug("%s: seg %u: bad start\n", __func__, bank);
+			aprint_debug("%s: seg %p: bad start\n", __func__, bank);
 			continue;
 		}
 
 		if (uvm_physmem_get_avail_end(bank) - uvm_physmem_get_avail_start(bank) < npgs) {
-			aprint_debug("%s: seg %u: too small for %zu pages\n",
+			aprint_debug("%s: seg %p: too small for %zu pages\n",
 			    __func__, bank, npgs);
 			continue;
 		}
@@ -496,7 +496,7 @@
 		 * amount of space left.
 		 */
 #define VM_PHYSMEM_SPACE(b)	((uvm_physmem_get_avail_end(b)) - (uvm_physmem_get_avail_start(b)))
-		if (uvm_physmem_valid(maybe_bank == false)
+		if (uvm_physmem_valid(maybe_bank) == false
 		    || VM_PHYSMEM_SPACE(bank) < VM_PHYSMEM_SPACE(maybe_bank)) {
 			maybe_bank = bank;
 		}
@@ -519,7 +519,7 @@
 		while(pa + ptoa(npgs - 1) > stolenpa)
 			uvm_page_physunload_force(bank, freelist, &stolenpa);
 		
-		aprint_debug("%s: seg %u: %zu pages stolen (%#"PRIxPADDR" left)\n",
+		aprint_debug("%s: seg %p: %zu pages stolen (%#"PRIxPADDR" left)\n",
 		    __func__, bank, npgs, VM_PHYSMEM_SPACE(bank));
 
 		va = pmap_md_map_poolpage(pa, size);
diff -rNu sys.clean/uvm/uvm_pglist.c sys/uvm/uvm_pglist.c
--- sys.clean/uvm/uvm_pglist.c	2016-11-04 07:49:12.000000000 +0000
+++ sys/uvm/uvm_pglist.c	2016-11-04 07:42:25.000000000 +0000
@@ -409,9 +409,9 @@
 #if defined(DEBUG)
 		{
 			paddr_t cidx = 0;
-			const int bank = vm_physseg_find(candidate, &cidx);
+			const uvm_physmem_t bank = vm_physseg_find(candidate, &cidx);
 			KDASSERTMSG(bank == psi,
-			    "vm_physseg_find(%#x) (%d) != psi %"PRIxPHYSMEM,
+			    "vm_physseg_find(%#x) (%"PRIxPHYSMEM ") != psi %"PRIxPHYSMEM,
 			     candidate, bank, psi);
 			KDASSERTMSG(cidx == candidate - uvm_physmem_get_start(psi),
 			    "vm_physseg_find(%#x): %#"PRIxPADDR" != off %"PRIxPADDR,
diff -rNu sys.clean/uvm/uvm_physmem.h sys/uvm/uvm_physmem.h
--- sys.clean/uvm/uvm_physmem.h	2016-11-04 07:49:12.000000000 +0000
+++ sys/uvm/uvm_physmem.h	2016-11-04 07:44:29.000000000 +0000
@@ -16,7 +16,7 @@
  * No APIs are explicitly #included in uvm_physmem.c
  */
 
-#define PRIxPHYSMEM "d"
+#define PRIxPHYSMEM "p"
 
 /*
  * These are specific values of invalid constants for uvm_physmem_t.