Commit 61c0f69a authored by Mark Brown's avatar Mark Brown Committed by Christian König
Browse files

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: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/aZyhDuaF5vi05KBY@sirena.org.uk
parent cc27314c

drivers/infiniband/core/ib_core_uverbs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/infiniband/core/uverbs_std_types_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -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);