Index: usr.sbin/pmcstat/pmcstat_log.c
===================================================================
--- usr.sbin/pmcstat/pmcstat_log.c	(revision 232878)
+++ usr.sbin/pmcstat/pmcstat_log.c	(working copy)
@@ -697,8 +697,8 @@
 				        ph.p_offset);
 				break;
 			case PT_LOAD:
-				if (ph.p_offset == 0)
-					image->pi_vaddr = ph.p_vaddr;
+				if ((ph.p_offset & (-ph.p_align)) == 0)
+					image->pi_vaddr = ph.p_vaddr & (-ph.p_align);
 				break;
 			}
 		}
Index: sys/sys/pmc.h
===================================================================
--- sys/sys/pmc.h	(revision 232989)
+++ sys/sys/pmc.h	(working copy)
@@ -589,7 +589,7 @@
  */
 
 struct pmc_syscall_args {
-	uint32_t	pmop_code;	/* one of PMC_OP_* */
+	register_t	pmop_code;	/* one of PMC_OP_* */
 	void		*pmop_data;	/* syscall parameter */
 };