diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-07-30 03:11:33 -0400 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-07-30 06:25:45 -0400 |
commit | e9da6e9905e639b0f842a244bc770b48ad0523e9 (patch) | |
tree | c99beeb259716121dcb388f35f54f99a2a414a92 /arch/arm/include/asm | |
parent | 5e6cafc83e30f0f70c79a2b7aef237dc57e29f02 (diff) |
ARM: dma-mapping: remove custom consistent dma region
This patch changes dma-mapping subsystem to use generic vmalloc areas
for all consistent dma allocations. This increases the total size limit
of the consistent allocations and removes platform hacks and a lot of
duplicated code.
Atomic allocations are served from special pool preallocated on boot,
because vmalloc areas cannot be reliably created in atomic context.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Minchan Kim <minchan@kernel.org>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index bbef15d04890..80777d871422 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h | |||
@@ -226,7 +226,7 @@ static inline int dma_mmap_writecombine(struct device *dev, struct vm_area_struc | |||
226 | * DMA region above it's default value of 2MB. It must be called before the | 226 | * DMA region above it's default value of 2MB. It must be called before the |
227 | * memory allocator is initialised, i.e. before any core_initcall. | 227 | * memory allocator is initialised, i.e. before any core_initcall. |
228 | */ | 228 | */ |
229 | extern void __init init_consistent_dma_size(unsigned long size); | 229 | static inline void init_consistent_dma_size(unsigned long size) { } |
230 | 230 | ||
231 | /* | 231 | /* |
232 | * For SA-1111, IXP425, and ADI systems the dma-mapping functions are "magic" | 232 | * For SA-1111, IXP425, and ADI systems the dma-mapping functions are "magic" |