diff options
| author |   Laura Abbott <lauraa@codeaurora.org> | 2013-12-12 19:28:33 +0000 |
|---|---|---|
| committer |   Catalin Marinas <catalin.marinas@arm.com> | 2013-12-19 17:44:09 +0000 |
| commit | 6ac2104debc235b745265b64d610237a6833fd53 (patch) | |
| tree | 220521d71f3799ec7d1510a00910ffb7efad1722 /arch/arm64/mm/init.c | |
| parent | arm64: Warn on NULL device structure for dma APIs (diff) | |
| download | linux-dev-6ac2104debc235b745265b64d610237a6833fd53.tar.xz linux-dev-6ac2104debc235b745265b64d610237a6833fd53.zip | |
arm64: Enable CMA
arm64 bit targets need the features CMA provides. Add the appropriate
hooks, header files, and Kconfig to allow this to happen.
Cc: Will Deacon <will.deacon@arm.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/mm/init.c')
| -rw-r--r-- | arch/arm64/mm/init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 0cb8742de4f2..d0b4c2efda90 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -30,6 +30,7 @@ #include <linux/memblock.h> #include <linux/sort.h> #include <linux/of_fdt.h> +#include <linux/dma-contiguous.h> #include <asm/sections.h> #include <asm/setup.h> @@ -159,6 +160,8 @@ void __init arm64_memblock_init(void) memblock_reserve(base, size); } + dma_contiguous_reserve(0); + memblock_allow_resize(); memblock_dump_all(); } |