From: Mark Brown Date: Mon, 23 Feb 2026 18:27:51 +0000 (+0000) Subject: RDMA/uverbs: Update for semantic conflict with drm-misc X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61c0f69a2ff79c8f388a9e973abb4853be467127;p=thirdparty%2Fkernel%2Flinux.git RDMA/uverbs: Update for semantic conflict with drm-misc /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove': /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration] 249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf); | ^~~~~~~~~~~~~~~~~~~ Signed-off-by: Mark Brown Reviewed-by: Christian König Signed-off-by: Christian König Link: https://lore.kernel.org/r/aZyhDuaF5vi05KBY@sirena.org.uk --- diff --git a/drivers/infiniband/core/ib_core_uverbs.c b/drivers/infiniband/core/ib_core_uverbs.c index d3836a62a0049..d6e99c79cf183 100644 --- a/drivers/infiniband/core/ib_core_uverbs.c +++ b/drivers/infiniband/core/ib_core_uverbs.c @@ -246,7 +246,7 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry) dma_resv_lock(uverbs_dmabuf->dmabuf->resv, NULL); list_del(&uverbs_dmabuf->dmabufs_elm); uverbs_dmabuf->revoked = true; - dma_buf_move_notify(uverbs_dmabuf->dmabuf); + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf); dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv, DMA_RESV_USAGE_BOOKKEEP, false, MAX_SCHEDULE_TIMEOUT); diff --git a/drivers/infiniband/core/uverbs_std_types_dmabuf.c b/drivers/infiniband/core/uverbs_std_types_dmabuf.c index dfdfcd1d1a446..149220a1599cf 100644 --- a/drivers/infiniband/core/uverbs_std_types_dmabuf.c +++ b/drivers/infiniband/core/uverbs_std_types_dmabuf.c @@ -167,7 +167,7 @@ static void uverbs_dmabuf_fd_destroy_uobj(struct ib_uobject *uobj, if (!uverbs_dmabuf->revoked) { uverbs_dmabuf->revoked = true; list_del(&uverbs_dmabuf->dmabufs_elm); - dma_buf_move_notify(uverbs_dmabuf->dmabuf); + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf); dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv, DMA_RESV_USAGE_BOOKKEEP, false, MAX_SCHEDULE_TIMEOUT);