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 | a6eb9fe105d5de0053b261148cee56c94b4720ca (patch) | |
| tree | 36e3f324a6a768397ef398674176c0f5f5365bff /arch/mips | |
| parent | cd1542c8197fc3c2eb3a8301505d5d9738fab1e4 (diff) | |
dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN
Now each architecture has the own dma_get_cache_alignment implementation.
dma_get_cache_alignment returns the minimum DMA alignment. Architectures
define it as ARCH_KMALLOC_MINALIGN (it's used to make sure that malloc'ed
buffer is DMA-safe; the buffer doesn't share a cache with the others). So
we can unify dma_get_cache_alignment implementations.
This patch:
dma_get_cache_alignment() needs to know if an architecture defines
ARCH_KMALLOC_MINALIGN or not (needs to know if architecture has DMA
alignment restriction). However, slab.h define ARCH_KMALLOC_MINALIGN if
architectures doesn't define it.
Let's rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN.
ARCH_KMALLOC_MINALIGN is used only in the internals of slab/slob/slub
(except for crypto).
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/mips')
| -rw-r--r-- | arch/mips/include/asm/mach-generic/kmalloc.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-ip27/kmalloc.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-ip32/kmalloc.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/mach-generic/kmalloc.h b/arch/mips/include/asm/mach-generic/kmalloc.h index b8e6deba352f..a5d669086ed9 100644 --- a/arch/mips/include/asm/mach-generic/kmalloc.h +++ b/arch/mips/include/asm/mach-generic/kmalloc.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Total overkill for most systems but need as a safe default. | 7 | * Total overkill for most systems but need as a safe default. |
| 8 | * Set this one if any device in the system might do non-coherent DMA. | 8 | * Set this one if any device in the system might do non-coherent DMA. |
| 9 | */ | 9 | */ |
| 10 | #define ARCH_KMALLOC_MINALIGN 128 | 10 | #define ARCH_DMA_MINALIGN 128 |
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
| 13 | #endif /* __ASM_MACH_GENERIC_KMALLOC_H */ | 13 | #endif /* __ASM_MACH_GENERIC_KMALLOC_H */ |
diff --git a/arch/mips/include/asm/mach-ip27/kmalloc.h b/arch/mips/include/asm/mach-ip27/kmalloc.h index 426bd049b2d7..82c23ce2afa7 100644 --- a/arch/mips/include/asm/mach-ip27/kmalloc.h +++ b/arch/mips/include/asm/mach-ip27/kmalloc.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define __ASM_MACH_IP27_KMALLOC_H | 2 | #define __ASM_MACH_IP27_KMALLOC_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * All happy, no need to define ARCH_KMALLOC_MINALIGN | 5 | * All happy, no need to define ARCH_DMA_MINALIGN |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #endif /* __ASM_MACH_IP27_KMALLOC_H */ | 8 | #endif /* __ASM_MACH_IP27_KMALLOC_H */ |
diff --git a/arch/mips/include/asm/mach-ip32/kmalloc.h b/arch/mips/include/asm/mach-ip32/kmalloc.h index b1e0be60f720..042ca926c48f 100644 --- a/arch/mips/include/asm/mach-ip32/kmalloc.h +++ b/arch/mips/include/asm/mach-ip32/kmalloc.h | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #if defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_RM7000) | 5 | #if defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_RM7000) |
| 6 | #define ARCH_KMALLOC_MINALIGN 32 | 6 | #define ARCH_DMA_MINALIGN 32 |
| 7 | #else | 7 | #else |
| 8 | #define ARCH_KMALLOC_MINALIGN 128 | 8 | #define ARCH_DMA_MINALIGN 128 |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #endif /* __ASM_MACH_IP32_KMALLOC_H */ | 11 | #endif /* __ASM_MACH_IP32_KMALLOC_H */ |