diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-14 23:30:13 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-14 23:30:13 -0700 |
commit | 7dc33e02fbdf4d19e17493ff2de87a86a4ad7699 (patch) | |
tree | f960bf0ced77ac0e99fcef04c3fc34b2390d8d0c | |
parent | cd618339b4e2df41c557f9a08842f2cf14f7d5a1 (diff) | |
parent | 29a6185d2f78e35b0b36d0ed94bc27d2b71e1ef3 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
-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 372075b4e672..9c17c2f8ba4c 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 c872988940db..cc3339d0a276 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -157,6 +157,7 @@ void __init arm64_memblock_init(void) memblock_reserve(base, size); } + early_init_fdt_scan_reserved_mem(); dma_contiguous_reserve(0); memblock_allow_resize(); |