Index: lib/libkvm/kvm.h
===================================================================
--- lib/libkvm/kvm.h
+++ lib/libkvm/kvm.h
@@ -82,18 +82,18 @@
 };
 
 struct kvm_page {
-	unsigned int version;
-	u_long paddr;
-	u_long kmap_vaddr;
-	u_long dmap_vaddr;
-	vm_prot_t prot;
-	u_long offset;
-	size_t len;
-	/* end of version 1 */
+	u_int		kp_version;
+	kpaddr_t	kp_paddr;
+	kvaddr_t	kp_kmap_vaddr;
+	kvaddr_t	kp_dmap_vaddr;
+	vm_prot_t	kp_prot;
+	off_t		kp_offset;
+	size_t		kp_len;
+	/* end of version 2 */
 };
 
 #define SWIF_DEV_PREFIX	0x0002
-#define	LIBKVM_WALK_PAGES_VERSION	1
+#define	LIBKVM_WALK_PAGES_VERSION	2
 
 __BEGIN_DECLS
 int	  kvm_close(kvm_t *);
Index: sys/sys/types.h
===================================================================
--- sys/sys/types.h
+++ sys/sys/types.h
@@ -257,6 +257,7 @@
  * used in place of size_t and (u)intptr_t in structs which contain such
  * types that are shared with userspace.
  */
+typedef	__uint64_t	kpaddr_t;
 typedef	__uint64_t	kvaddr_t;
 typedef	__uint64_t	ksize_t;