tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Mark Brown and committed by
Christian König 61c0f69a cc27314c

+2 -2
+1 -1
drivers/infiniband/core/ib_core_uverbs.c
··· 246 246 dma_resv_lock(uverbs_dmabuf->dmabuf->resv, NULL); 247 247 list_del(&uverbs_dmabuf->dmabufs_elm); 248 248 uverbs_dmabuf->revoked = true; 249 - dma_buf_move_notify(uverbs_dmabuf->dmabuf); 249 + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf); 250 250 dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv, 251 251 DMA_RESV_USAGE_BOOKKEEP, false, 252 252 MAX_SCHEDULE_TIMEOUT);
+1 -1
drivers/infiniband/core/uverbs_std_types_dmabuf.c
··· 167 167 if (!uverbs_dmabuf->revoked) { 168 168 uverbs_dmabuf->revoked = true; 169 169 list_del(&uverbs_dmabuf->dmabufs_elm); 170 - dma_buf_move_notify(uverbs_dmabuf->dmabuf); 170 + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf); 171 171 dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv, 172 172 DMA_RESV_USAGE_BOOKKEEP, false, 173 173 MAX_SCHEDULE_TIMEOUT);