diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-14 23:30:06 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-14 23:30:06 -0700 |
commit | 9ea00e4fa07ce46ab79c92087c72ae100de4de42 (patch) | |
tree | 6e12b8065fcba9dfe1618d72803f30fc75c47b1f | |
parent | 4fdaee37b59a97c2f08abfe351e0255e5bf7008e (diff) | |
parent | c95c4e2a6bb8d44f9a8f59eadd99a9a615c53112 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
-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 3a8bfb12f726..08a6166d05cd 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -56,6 +56,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 52806427e15d..81bdd29df3a4 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -170,6 +170,7 @@ void __init arm64_memblock_init(void) memblock_reserve(base, size); } + early_init_fdt_scan_reserved_mem(); dma_contiguous_reserve(0); memblock_allow_resize(); |