diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-11-21 14:23:37 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-03-03 15:51:32 +0000 |
| commit | 9f6c2be0197ed887375538bc9f7cffa1b33ecac1 (patch) | |
| tree | 81c52d549c5125c79214c367641424d44c2c459b | |
| parent | 65b373b92f22206ed007fa7e48b464dd35aae716 (diff) | |
| download | linux-stable-9f6c2be0197ed887375538bc9f7cffa1b33ecac1.tar.gz linux-stable-9f6c2be0197ed887375538bc9f7cffa1b33ecac1.tar.bz2 linux-stable-9f6c2be0197ed887375538bc9f7cffa1b33ecac1.zip | |
scsi: dma-mapping: always provide dma_get_cache_alignment
commit 860dd4424f344400b491b212ee4acb3a358ba9d9 upstream.
Provide the dummy version of dma_get_cache_alignment that always returns
1 even if CONFIG_HAS_DMA is not set, so that drivers and subsystems can
use it without ifdefs.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
[bwh: Backported to 3.16: Also delete the conflicting declaration in
<asm-generic/dma-mapping-broken.h>]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | include/asm-generic/dma-mapping-broken.h | 3 | ||||
| -rw-r--r-- | include/linux/dma-mapping.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h index 6c32af918c2f..9634b8e6927f 100644 --- a/include/asm-generic/dma-mapping-broken.h +++ b/include/asm-generic/dma-mapping-broken.h @@ -85,9 +85,6 @@ dma_supported(struct device *dev, u64 mask); extern int dma_set_mask(struct device *dev, u64 mask); -extern int -dma_get_cache_alignment(void); - extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction); diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 931b70986272..9ef8dd0cbf0d 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -181,7 +181,6 @@ static inline void *dma_zalloc_coherent(struct device *dev, size_t size, return ret; } -#ifdef CONFIG_HAS_DMA static inline int dma_get_cache_alignment(void) { #ifdef ARCH_DMA_MINALIGN @@ -189,7 +188,6 @@ static inline int dma_get_cache_alignment(void) #endif return 1; } -#endif /* flags for the coherent memory api */ #define DMA_MEMORY_MAP 0x01 |