Index: sys/kern/subr_rman.c =================================================================== --- sys/kern/subr_rman.c +++ sys/kern/subr_rman.c @@ -1010,7 +1010,7 @@ */ if (res_idx == -1) { bzero(&urm, sizeof(urm)); - urm.rm_handle = (uintptr_t)rm; + urm.rm_handle = (kvaddr_t)rm; if (rm->rm_descr != NULL) strlcpy(urm.rm_descr, rm->rm_descr, RM_TEXTLEN); urm.rm_start = rm->rm_start; @@ -1041,9 +1041,9 @@ found: bzero(&ures, sizeof(ures)); - ures.r_handle = (uintptr_t)res; - ures.r_parent = (uintptr_t)res->r_rm; - ures.r_device = (uintptr_t)res->r_dev; + ures.r_handle = (kvaddr_t)res; + ures.r_parent = (kvaddr_t)res->r_rm; + ures.r_device = (kvaddr_t)res->r_dev; if (res->r_dev != NULL) { if (device_get_name(res->r_dev) != NULL) { snprintf(ures.r_devname, RM_TEXTLEN, Index: sys/sys/rman.h =================================================================== --- sys/sys/rman.h +++ sys/sys/rman.h @@ -72,9 +72,9 @@ * Userspace-exported structures. */ struct u_resource { - uintptr_t r_handle; /* resource uniquifier */ - uintptr_t r_parent; /* parent rman */ - uintptr_t r_device; /* device owning this resource */ + kvaddr_t r_handle; /* resource uniquifier */ + kvaddr_t r_parent; /* parent rman */ + kvaddr_t r_device; /* device owning this resource */ char r_devname[RM_TEXTLEN]; /* device name XXX obsolete */ rman_res_t r_start; /* offset in resource space */ @@ -83,7 +83,7 @@ }; struct u_rman { - uintptr_t rm_handle; /* rman uniquifier */ + kvaddr_t rm_handle; /* rman uniquifier */ char rm_descr[RM_TEXTLEN]; /* rman description */ rman_res_t rm_start; /* base of managed region */