diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index f43b6db60be..e31862a6996 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -72,7 +72,7 @@ struct acpi_softc {
     bus_dma_tag_t	acpi_waketag;
     bus_dmamap_t	acpi_wakemap;
     vm_offset_t		acpi_wakeaddr;
-    vm_offset_t		acpi_wakephys;
+    vm_paddr_t		acpi_wakephys;
 
     struct sysctl_ctx_list	 acpi_battery_sysctl_ctx;
     struct sysctl_oid		*acpi_battery_sysctl_tree;
diff --git a/sys/sys/jumbo.h b/sys/sys/jumbo.h
index f8c794123e6..3d7cc285743 100644
--- a/sys/sys/jumbo.h
+++ b/sys/sys/jumbo.h
@@ -38,9 +38,9 @@
 #ifdef _KERNEL
 extern vm_offset_t jumbo_basekva;
 
-static __inline caddr_t	jumbo_phys_to_kva(vm_offset_t pa);
+static __inline caddr_t	jumbo_phys_to_kva(vm_paddr_t pa);
 static __inline caddr_t
-jumbo_phys_to_kva(vm_offset_t pa)
+jumbo_phys_to_kva(vm_paddr_t pa)
 {
 	vm_page_t pg;