diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:24 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:24 +0000 |
commit | 8cc9251737d1883e33fd0a7dafbd4062916c1ca6 (patch) | |
tree | 6a1901ccbce167330049ce9b2afced122b325c4a /arch/arm/mm/init.c | |
parent | e64ab473dddaffdfc4bd0b385204f472f2cb00d6 (diff) | |
parent | 10fce53c0ef8f6e79115c3d9e0d7ea1338c3fa37 (diff) | |
download | linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.tar.gz linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.tar.bz2 linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.zip |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/mm/init.c')
-rw-r--r-- | arch/arm/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index d57112a276f5..a391804c7ce3 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -223,7 +223,6 @@ void __init arm_memblock_init(const struct machine_desc *mdesc) if (mdesc->reserve) mdesc->reserve(); - early_init_fdt_reserve_self(); early_init_fdt_scan_reserved_mem(); /* reserve memory for DMA contiguous allocations */ |