diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-02-28 14:42:55 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-13 10:53:07 +0000 |
commit | 9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce (patch) | |
tree | 8cf3ae2aff740faef8b33c0f6eb39f93fdd39ac7 /arch | |
parent | bcedb5f9bd74662968fc1b4cb22f24abb4b7723d (diff) | |
download | op-kernel-dev-9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce.zip op-kernel-dev-9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce.tar.gz |
arm64: add support for reserved memory defined by device tree
Enable reserved memory initialization from device tree.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm64/mm/init.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 27bbcfc..6abf154 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -43,6 +43,7 @@ config ARM64 select NO_BOOTMEM select OF select OF_EARLY_FLATTREE + select OF_RESERVED_MEM select PERF_USE_VMALLOC select POWER_RESET select POWER_SUPPLY diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index d0b4c2e..3fb8d50 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -160,6 +160,7 @@ void __init arm64_memblock_init(void) memblock_reserve(base, size); } + early_init_fdt_scan_reserved_mem(); dma_contiguous_reserve(0); memblock_allow_resize(); |