diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c b/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c --- a/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c @@ -131,7 +131,7 @@ len = IOCPARM_LEN(zcmd); vecnum = zcmd & 0xff; zp = (void *)arg; - uaddr = (void *)zp->zfs_cmd; + uaddr = (void *)(uintptr_t)zp->zfs_cmd; error = 0; zcl = NULL; diff --git a/sys/dev/iser/iser_initiator.c b/sys/dev/iser/iser_initiator.c --- a/sys/dev/iser/iser_initiator.c +++ b/sys/dev/iser/iser_initiator.c @@ -290,7 +290,7 @@ offset = ((uintptr_t)buf) & ~PAGE_MASK; len = min(PAGE_SIZE - offset, tlen); sg_set_buf(sg, buf, len); - buf = (void *)(((u64)buf) + (u64)len); + buf = (void *)((uintptr_t)buf + len); } data_buf->size = i; diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -949,7 +949,7 @@ return EINVAL; } - if (offset_in_page((uint64_t)gmi->virt_addr) != 0) { + if (offset_in_page((uintptr_t)gmi->virt_addr) != 0) { mana_err(NULL, "gmi not page aligned: %p\n", gmi->virt_addr); return EINVAL; @@ -1508,19 +1508,19 @@ static void mana_gd_init_registers(struct gdma_context *gc) { - uint64_t bar0_va = rman_get_bushandle(gc->bar0); + uintptr_t bar0_va = rman_get_bushandle(gc->bar0); vm_paddr_t bar0_pa = rman_get_start(gc->bar0); gc->db_page_size = mana_gd_r32(gc, GDMA_REG_DB_PAGE_SIZE) & 0xFFFF; gc->db_page_base = - (void *) (bar0_va + mana_gd_r64(gc, GDMA_REG_DB_PAGE_OFFSET)); + (void *)(bar0_va + (size_t)mana_gd_r64(gc, GDMA_REG_DB_PAGE_OFFSET)); gc->phys_db_page_base = bar0_pa + mana_gd_r64(gc, GDMA_REG_DB_PAGE_OFFSET); gc->shm_base = - (void *) (bar0_va + mana_gd_r64(gc, GDMA_REG_SHM_OFFSET)); + (void *)(bar0_va + (size_t)mana_gd_r64(gc, GDMA_REG_SHM_OFFSET)); mana_dbg(NULL, "db_page_size 0x%xx, db_page_base %p," " shm_base %p\n", diff --git a/sys/dev/mana/hw_channel.c b/sys/dev/mana/hw_channel.c --- a/sys/dev/mana/hw_channel.c +++ b/sys/dev/mana/hw_channel.c @@ -128,7 +128,7 @@ int err; sge = &req->sge; - sge->address = (uint64_t)req->buf_sge_addr; + sge->address = (uintptr_t)req->buf_sge_addr; sge->mem_key = hwc_rxq->msg_buf->gpa_mkey; sge->size = req->buf_len; @@ -616,7 +616,7 @@ tx_oob->vsq_id = hwc_txq->gdma_wq->id; sge = &req->sge; - sge->address = (uint64_t)req->buf_sge_addr; + sge->address = (uintptr_t)req->buf_sge_addr; sge->mem_key = hwc_txq->msg_buf->gpa_mkey; sge->size = req->msg_size;