diff options
| author | Laura Abbott <lauraa@codeaurora.org> | 2014-10-09 15:26:44 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-23 20:28:53 +0000 |
| commit | 9698ac7c353d6f22100c9fa24a830cae6a466cb4 (patch) | |
| tree | 7b63451138c3e5dc2aa1ea87c81f10c28921f46c /drivers | |
| parent | 4b647eeef8ef684754b58b46eb5bc7d9b55e7279 (diff) | |
arm64: add atomic pool for non-coherent and CMA allocationsv3.10/topic/arm64-misc
Neither CMA nor noncoherent allocations support atomic allocations.
Add a dedicated atomic pool to support this.
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Riley <davidriley@chromium.org>
Cc: Olof Johansson <olof@lixom.net>
Cc: Ritesh Harjain <ritesh.harjani@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d4932f9e81ae7a7bf3c3967e48373909b9c98ee5)
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index 9c36ca9ed1dd..dd302ea3b599 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c @@ -287,7 +287,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size, area->pages = pages; - if (map_vm_area(area, prot, pages)) { + if (map_vm_area(area, prot, &pages)) { vunmap(area->addr); return NULL; } |