diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-22 10:58:24 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-01-10 16:41:14 +0100 |
| commit | 2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f (patch) | |
| tree | 456f9f6971b71947398fd2b399d3e2c686997674 /arch/powerpc/include/asm/dma-mapping.h | |
| parent | bf15f90b07de75a0873bee7e41b138961c049137 (diff) | |
| download | linux-stable-2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f.tar.gz linux-stable-2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f.tar.bz2 linux-stable-2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f.zip | |
powerpc: rename dma_direct_ to dma_nommu_
We want to use the dma_direct_ namespace for a generic implementation,
so rename powerpc to the second best choice: dma_nommu_.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/powerpc/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/powerpc/include/asm/dma-mapping.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h index f6ab51205a85..8fa394520af6 100644 --- a/arch/powerpc/include/asm/dma-mapping.h +++ b/arch/powerpc/include/asm/dma-mapping.h @@ -19,13 +19,13 @@ #include <asm/swiotlb.h> /* Some dma direct funcs must be visible for use in other dma_ops */ -extern void *__dma_direct_alloc_coherent(struct device *dev, size_t size, +extern void *__dma_nommu_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag, unsigned long attrs); -extern void __dma_direct_free_coherent(struct device *dev, size_t size, +extern void __dma_nommu_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, unsigned long attrs); -extern int dma_direct_mmap_coherent(struct device *dev, +extern int dma_nommu_mmap_coherent(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t handle, size_t size, unsigned long attrs); @@ -73,7 +73,7 @@ static inline unsigned long device_to_mask(struct device *dev) #ifdef CONFIG_PPC64 extern struct dma_map_ops dma_iommu_ops; #endif -extern const struct dma_map_ops dma_direct_ops; +extern const struct dma_map_ops dma_nommu_ops; static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) { |