diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:50:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:50:35 -0400 |
| commit | 88c8199b9d2f5ec0a8468a0495ba4c9656846500 (patch) | |
| tree | 666dc82c5a1ec041a7312f4ef3306bb1806620eb /include | |
| parent | 0439208a8a399f0c4307c561d97e3f5523f5d085 (diff) | |
| parent | 50aa485e1abb7566ce68418c7bbc6a6b454f9039 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[BBC_I2C]: kmalloc + memset conversion to kzalloc
[BBC_ENVCTRL]: kmalloc + memset conversion to kzalloc
[SPARC]: Fix exec failures on sun4c.
[SPARC] Videopix Frame Grabber: Fix unreleased lock in vfc_debug()
[SPARC64]: Add missing dma_get_cache_alignment().
[SUNLANCE]: Fix sparc32 crashes by using of_*() interfaces.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/dma-mapping.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h index 0a1006692bb2..a72a5f271f31 100644 --- a/include/asm-sparc64/dma-mapping.h +++ b/include/asm-sparc64/dma-mapping.h | |||
| @@ -127,6 +127,13 @@ static inline int dma_mapping_error(dma_addr_t dma_addr) | |||
| 127 | return (dma_addr == DMA_ERROR_CODE); | 127 | return (dma_addr == DMA_ERROR_CODE); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | static inline int dma_get_cache_alignment(void) | ||
| 131 | { | ||
| 132 | /* no easy way to get cache size on all processors, so return | ||
| 133 | * the maximum possible, to be safe */ | ||
| 134 | return (1 << INTERNODE_CACHE_SHIFT); | ||
| 135 | } | ||
| 136 | |||
| 130 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | 137 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
| 131 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | 138 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
| 132 | #define dma_is_consistent(d, h) (1) | 139 | #define dma_is_consistent(d, h) (1) |