dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
Seeing the kunmap_atomic dma_buf_ops share the same name with a macro in highmem.h, the former can be aliased if any dma-buf user includes that header. I'm personally trying to include highmem.h inside scatterlist.h and this breaks the dma-buf code proper. Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP. To maintain consistency I've renamed all four of kmap* and kunmap* to be map* and unmap*. (Even though only kmap_atomic presently conflicts.) [1] https://www.spinics.net/lists/target-devel/msg15070.html Signed-off-by:Logan Gunthorpe <logang@deltatee.com> Reviewed-by:
Sinclair Yeh <syeh@vmware.com> Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by:
Sumit Semwal <sumit.semwal@linaro.org> Signed-off-by:
Sumit Semwal <sumit.semwal@linaro.org> Link: http://patchwork.freedesktop.org/patch/msgid/1492630570-879-1-git-send-email-logang@deltatee.com
Showing
- drivers/dma-buf/dma-buf.c 8 additions, 8 deletionsdrivers/dma-buf/dma-buf.c
- drivers/gpu/drm/armada/armada_gem.c 4 additions, 4 deletionsdrivers/gpu/drm/armada/armada_gem.c
- drivers/gpu/drm/drm_prime.c 4 additions, 4 deletionsdrivers/gpu/drm/drm_prime.c
- drivers/gpu/drm/i915/i915_gem_dmabuf.c 4 additions, 4 deletionsdrivers/gpu/drm/i915/i915_gem_dmabuf.c
- drivers/gpu/drm/i915/selftests/mock_dmabuf.c 4 additions, 4 deletionsdrivers/gpu/drm/i915/selftests/mock_dmabuf.c
- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c 4 additions, 4 deletionsdrivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
- drivers/gpu/drm/tegra/gem.c 4 additions, 4 deletionsdrivers/gpu/drm/tegra/gem.c
- drivers/gpu/drm/udl/udl_dmabuf.c 4 additions, 4 deletionsdrivers/gpu/drm/udl/udl_dmabuf.c
- drivers/gpu/drm/vmwgfx/vmwgfx_prime.c 4 additions, 4 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_prime.c
- drivers/media/v4l2-core/videobuf2-dma-contig.c 2 additions, 2 deletionsdrivers/media/v4l2-core/videobuf2-dma-contig.c
- drivers/media/v4l2-core/videobuf2-dma-sg.c 2 additions, 2 deletionsdrivers/media/v4l2-core/videobuf2-dma-sg.c
- drivers/media/v4l2-core/videobuf2-vmalloc.c 2 additions, 2 deletionsdrivers/media/v4l2-core/videobuf2-vmalloc.c
- drivers/staging/android/ion/ion.c 4 additions, 4 deletionsdrivers/staging/android/ion/ion.c
- include/linux/dma-buf.h 11 additions, 11 deletionsinclude/linux/dma-buf.h
Loading
Please register or sign in to comment