diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-08-10 21:03:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 11:59:21 -0400 |
commit | 4565f0170dfc849b3629c27d769db800467baa62 (patch) | |
tree | a2c70fb6f2f4826749b704ed83557623ca95bca5 /arch/sparc/include | |
parent | a6eb9fe105d5de0053b261148cee56c94b4720ca (diff) |
dma-mapping: unify dma_get_cache_alignment implementations
dma_get_cache_alignment returns the minimum DMA alignment. Architectures
defines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN). So we
can unify dma_get_cache_alignment implementations.
Note that some architectures implement dma_get_cache_alignment wrongly.
dma_get_cache_alignment() should return the minimum DMA alignment. So
fully-coherent architectures should return 1. This patch also fixes this
issue.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/dma-mapping.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h index 4b4a0c0b0ccd..74db853ec2cf 100644 --- a/arch/sparc/include/asm/dma-mapping.h +++ b/arch/sparc/include/asm/dma-mapping.h | |||
@@ -52,15 +52,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | |||
52 | return (dma_addr == DMA_ERROR_CODE); | 52 | return (dma_addr == DMA_ERROR_CODE); |
53 | } | 53 | } |
54 | 54 | ||
55 | static inline int dma_get_cache_alignment(void) | ||
56 | { | ||
57 | /* | ||
58 | * no easy way to get cache size on all processors, so return | ||
59 | * the maximum possible, to be safe | ||
60 | */ | ||
61 | return (1 << INTERNODE_CACHE_SHIFT); | ||
62 | } | ||
63 | |||
64 | static inline int dma_set_mask(struct device *dev, u64 mask) | 55 | static inline int dma_set_mask(struct device *dev, u64 mask) |
65 | { | 56 | { |
66 | #ifdef CONFIG_PCI | 57 | #ifdef CONFIG_PCI |