diff options
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r-- | include/asm-ppc64/dma-mapping.h | 4 | ||||
-rw-r--r-- | include/asm-ppc64/iommu.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ppc64/dma-mapping.h b/include/asm-ppc64/dma-mapping.h index 9ad8adee0067..fb68fa23bea8 100644 --- a/include/asm-ppc64/dma-mapping.h +++ b/include/asm-ppc64/dma-mapping.h | |||
@@ -19,7 +19,7 @@ | |||
19 | extern int dma_supported(struct device *dev, u64 mask); | 19 | extern int dma_supported(struct device *dev, u64 mask); |
20 | extern int dma_set_mask(struct device *dev, u64 dma_mask); | 20 | extern int dma_set_mask(struct device *dev, u64 dma_mask); |
21 | extern void *dma_alloc_coherent(struct device *dev, size_t size, | 21 | extern void *dma_alloc_coherent(struct device *dev, size_t size, |
22 | dma_addr_t *dma_handle, unsigned int __nocast flag); | 22 | dma_addr_t *dma_handle, gfp_t flag); |
23 | extern void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, | 23 | extern void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, |
24 | dma_addr_t dma_handle); | 24 | dma_addr_t dma_handle); |
25 | extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, | 25 | extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, |
@@ -118,7 +118,7 @@ dma_cache_sync(void *vaddr, size_t size, | |||
118 | */ | 118 | */ |
119 | struct dma_mapping_ops { | 119 | struct dma_mapping_ops { |
120 | void * (*alloc_coherent)(struct device *dev, size_t size, | 120 | void * (*alloc_coherent)(struct device *dev, size_t size, |
121 | dma_addr_t *dma_handle, unsigned int __nocast flag); | 121 | dma_addr_t *dma_handle, gfp_t flag); |
122 | void (*free_coherent)(struct device *dev, size_t size, | 122 | void (*free_coherent)(struct device *dev, size_t size, |
123 | void *vaddr, dma_addr_t dma_handle); | 123 | void *vaddr, dma_addr_t dma_handle); |
124 | dma_addr_t (*map_single)(struct device *dev, void *ptr, | 124 | dma_addr_t (*map_single)(struct device *dev, void *ptr, |
diff --git a/include/asm-ppc64/iommu.h b/include/asm-ppc64/iommu.h index 72dcf8116b04..c2f3b6e8a42f 100644 --- a/include/asm-ppc64/iommu.h +++ b/include/asm-ppc64/iommu.h | |||
@@ -122,7 +122,7 @@ extern void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist, | |||
122 | int nelems, enum dma_data_direction direction); | 122 | int nelems, enum dma_data_direction direction); |
123 | 123 | ||
124 | extern void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size, | 124 | extern void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size, |
125 | dma_addr_t *dma_handle, unsigned int __nocast flag); | 125 | dma_addr_t *dma_handle, gfp_t flag); |
126 | extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, | 126 | extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, |
127 | void *vaddr, dma_addr_t dma_handle); | 127 | void *vaddr, dma_addr_t dma_handle); |
128 | extern dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr, | 128 | extern dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr, |