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 132f93b05154..f93d5ac8f81c 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
@@ -2949,7 +2949,8 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, | |||
2949 | } | 2949 | } |
2950 | 2950 | ||
2951 | static void *intel_alloc_coherent(struct device *hwdev, size_t size, | 2951 | static void *intel_alloc_coherent(struct device *hwdev, size_t size, |
2952 | dma_addr_t *dma_handle, gfp_t flags) | 2952 | dma_addr_t *dma_handle, gfp_t flags, |
2953 | struct dma_attrs *attrs) | ||
2953 | { | 2954 | { |
2954 | void *vaddr; | 2955 | void *vaddr; |
2955 | int order; | 2956 | int order; |
@@ -2981,7 +2982,7 @@ static void *intel_alloc_coherent(struct device *hwdev, size_t size, | |||
2981 | } | 2982 | } |
2982 | 2983 | ||
2983 | static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, | 2984 | static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, |
2984 | dma_addr_t dma_handle) | 2985 | dma_addr_t dma_handle, struct dma_attrs *attrs) |
2985 | { | 2986 | { |
2986 | int order; | 2987 | int order; |
2987 | 2988 | ||
@@ -3126,8 +3127,8 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) | |||
3126 | } | 3127 | } |
3127 | 3128 | ||
3128 | struct dma_map_ops intel_dma_ops = { | 3129 | struct dma_map_ops intel_dma_ops = { |
3129 | .alloc_coherent = intel_alloc_coherent, | 3130 | .alloc = intel_alloc_coherent, |
3130 | .free_coherent = intel_free_coherent, | 3131 | .free = intel_free_coherent, |
3131 | .map_sg = intel_map_sg, | 3132 | .map_sg = intel_map_sg, |
3132 | .unmap_sg = intel_unmap_sg, | 3133 | .unmap_sg = intel_unmap_sg, |
3133 | .map_page = intel_map_page, | 3134 | .map_page = intel_map_page, |