diff options
| author | Linus Torvalds | 2017-03-07 10:23:17 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2017-03-07 10:23:17 -0800 |
| commit | 8c2c8ed8b85d4012d26caf1c221c291c687d89f0 (patch) | |
| tree | c28ac6bfc83c198b2a61515694d05ad22f2cc25a /arch | |
| parent | 304362a8bce1a5b7f9491be5a0643cd14a52364d (diff) | |
| parent | 69369f52d28a34c84acb6f2a8a585e743441566a (diff) | |
Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb updates from Konrad Rzeszutek Wilk:
"Two tiny implementations of the DMA API for callback in ARM (for Xen)"
* 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb-xen: implement xen_swiotlb_get_sgtable callback
swiotlb-xen: implement xen_swiotlb_dma_mmap callback
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/xen/mm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index ce18c91b50a1..f0325d96b97a 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -198,6 +198,8 @@ static const 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) |