diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-08-10 18:03:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 08:59:21 -0700 |
| commit | 4565f0170dfc849b3629c27d769db800467baa62 (patch) | |
| tree | a2c70fb6f2f4826749b704ed83557623ca95bca5 /arch/parisc/include/asm/dma-mapping.h | |
| parent | a6eb9fe105d5de0053b261148cee56c94b4720ca (diff) | |
| download | blackbird-op-linux-4565f0170dfc849b3629c27d769db800467baa62.tar.gz blackbird-op-linux-4565f0170dfc849b3629c27d769db800467baa62.zip | |
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/parisc/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/parisc/include/asm/dma-mapping.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h index da6943380908..44d3f62ccf9d 100644 --- a/arch/parisc/include/asm/dma-mapping.h +++ b/arch/parisc/include/asm/dma-mapping.h @@ -185,12 +185,6 @@ dma_set_mask(struct device *dev, u64 mask) } static inline int -dma_get_cache_alignment(void) -{ - return dcache_stride; -} - -static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr) { return (hppa_dma_ops->dma_sync_single_for_cpu == NULL); |
