diff options
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
-rw-r--r-- | drivers/iommu/intel-iommu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index c9c6053198d4..e39bfdc055c3 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
@@ -2938,7 +2938,8 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, | |||
2938 | } | 2938 | } |
2939 | 2939 | ||
2940 | static void *intel_alloc_coherent(struct device *hwdev, size_t size, | 2940 | static void *intel_alloc_coherent(struct device *hwdev, size_t size, |
2941 | dma_addr_t *dma_handle, gfp_t flags) | 2941 | dma_addr_t *dma_handle, gfp_t flags, |
2942 | struct dma_attrs *attrs) | ||
2942 | { | 2943 | { |
2943 | void *vaddr; | 2944 | void *vaddr; |
2944 | int order; | 2945 | int order; |
@@ -2970,7 +2971,7 @@ static void *intel_alloc_coherent(struct device *hwdev, size_t size, | |||
2970 | } | 2971 | } |
2971 | 2972 | ||
2972 | static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, | 2973 | static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, |
2973 | dma_addr_t dma_handle) | 2974 | dma_addr_t dma_handle, struct dma_attrs *attrs) |
2974 | { | 2975 | { |
2975 | int order; | 2976 | int order; |
2976 | 2977 | ||
@@ -3115,8 +3116,8 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) | |||
3115 | } | 3116 | } |
3116 | 3117 | ||
3117 | struct dma_map_ops intel_dma_ops = { | 3118 | struct dma_map_ops intel_dma_ops = { |
3118 | .alloc_coherent = intel_alloc_coherent, | 3119 | .alloc = intel_alloc_coherent, |
3119 | .free_coherent = intel_free_coherent, | 3120 | .free = intel_free_coherent, |
3120 | .map_sg = intel_map_sg, | 3121 | .map_sg = intel_map_sg, |
3121 | .unmap_sg = intel_unmap_sg, | 3122 | .unmap_sg = intel_unmap_sg, |
3122 | .map_page = intel_map_page, | 3123 | .map_page = intel_map_page, |