summaryrefslogtreecommitdiff
path: root/include/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 15:52:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 15:52:23 -0800
commitb5cab0da75c292ffa0fbd68dd2c820066b2842de (patch)
tree3b8d4483b8ce6d1ea997cde2c89445564cba7b0f /include/xen
parent93173b5bf2841da7e3a9b0cb1312ef5c87251524 (diff)
parentd29fa0cb7602fa3e96c9eee05e14d14d3e823c89 (diff)
downloadlinux-next-b5cab0da75c292ffa0fbd68dd2c820066b2842de.tar.gz
Merge branch 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb updates from Konrad Rzeszutek Wilk: - minor fixes (rate limiting), remove certain functions - support for DMA_ATTR_SKIP_CPU_SYNC which is an optimization in the DMA API * 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support swiotlb: Add support for DMA_ATTR_SKIP_CPU_SYNC swiotlb-xen: Enforce return of DMA_ERROR_CODE in mapping function swiotlb: Drop unused functions swiotlb_map_sg and swiotlb_unmap_sg swiotlb: Rate-limit printing when running out of SW-IOMMU space
Diffstat (limited to 'include/xen')
-rw-r--r--include/xen/swiotlb-xen.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h
index 7c35e279d1e3..a0083be5d529 100644
--- a/include/xen/swiotlb-xen.h
+++ b/include/xen/swiotlb-xen.h
@@ -51,9 +51,6 @@ xen_swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
int nelems, enum dma_data_direction dir);
extern int
-xen_swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);
-
-extern int
xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);
extern int