summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 10:31:09 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 10:31:09 +1100
commit1206e4b40d30f6ec9628351bcdbef31bd0e31baf (patch)
tree1503bde2e82e0b9d7eae558d60bf45a9e4aca929 /arch
parent3aa03bb656eb059d5b5e3d0af3a60f288e5f61e4 (diff)
parent69369f52d28a34c84acb6f2a8a585e743441566a (diff)
Merge remote-tracking branch 'swiotlb/linux-next'
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/xen/mm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
index bd62d94f8ac5..76ea48a614e1 100644
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -198,6 +198,8 @@ static struct dma_map_ops xen_swiotlb_dma_ops = {
.unmap_page = xen_swiotlb_unmap_page,
.dma_supported = xen_swiotlb_dma_supported,
.set_dma_mask = xen_swiotlb_set_dma_mask,
+ .mmap = xen_swiotlb_dma_mmap,
+ .get_sgtable = xen_swiotlb_get_sgtable,
};
int __init xen_mm_init(void)