]> git.hungrycats.org Git - linux/commit
fix xen_swiotlb_dma_mmap prototype
authorArnd Bergmann <arnd@arndb.de>
Wed, 4 Oct 2017 13:51:29 +0000 (15:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Oct 2017 07:35:53 +0000 (09:35 +0200)
commit376c6f62f8d4f73a0573a0e69323afe39d834893
tree192012c83eb35899e4e0768d512fc828390a6b77
parentbc9f6868dfb50ba357d4db5916632c94f8d94a4c
fix xen_swiotlb_dma_mmap prototype

xen_swiotlb_dma_mmap was backported from v4.10, but older
kernels before commit 00085f1efa38 ("dma-mapping: use unsigned long
for dma_attrs") use a different signature:

arm/xen/mm.c:202:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .mmap = xen_swiotlb_dma_mmap,
          ^~~~~~~~~~~~~~~~~~~~
arm/xen/mm.c:202:10: note: (near initialization for 'xen_swiotlb_dma_ops.mmap')

This adapts the patch to the old calling conventions.

Fixes: "swiotlb-xen: implement xen_swiotlb_dma_mmap callback"
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/xen/swiotlb-xen.c
include/xen/swiotlb-xen.h