aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/mm/init.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 51d5352e6ad5..091d428d64ac 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -126,8 +126,6 @@ static void arm64_memory_present(void)
126 126
127void __init arm64_memblock_init(void) 127void __init arm64_memblock_init(void)
128{ 128{
129 u64 *reserve_map, base, size;
130
131 /* Register the kernel text, kernel data and initrd with memblock */ 129 /* Register the kernel text, kernel data and initrd with memblock */
132 memblock_reserve(__pa(_text), _end - _text); 130 memblock_reserve(__pa(_text), _end - _text);
133#ifdef CONFIG_BLK_DEV_INITRD 131#ifdef CONFIG_BLK_DEV_INITRD
@@ -142,25 +140,6 @@ void __init arm64_memblock_init(void)
142 memblock_reserve(__pa(swapper_pg_dir), SWAPPER_DIR_SIZE); 140 memblock_reserve(__pa(swapper_pg_dir), SWAPPER_DIR_SIZE);
143 memblock_reserve(__pa(idmap_pg_dir), IDMAP_DIR_SIZE); 141 memblock_reserve(__pa(idmap_pg_dir), IDMAP_DIR_SIZE);
144 142
145 /* Reserve the dtb region */
146 memblock_reserve(virt_to_phys(initial_boot_params),
147 be32_to_cpu(initial_boot_params->totalsize));
148
149 /*
150 * Process the reserve map. This will probably overlap the initrd
151 * and dtb locations which are already reserved, but overlapping
152 * doesn't hurt anything
153 */
154 reserve_map = ((void*)initial_boot_params) +
155 be32_to_cpu(initial_boot_params->off_mem_rsvmap);
156 while (1) {
157 base = be64_to_cpup(reserve_map++);
158 size = be64_to_cpup(reserve_map++);
159 if (!size)
160 break;
161 memblock_reserve(base, size);
162 }
163
164 early_init_fdt_scan_reserved_mem(); 143 early_init_fdt_scan_reserved_mem();
165 dma_contiguous_reserve(0); 144 dma_contiguous_reserve(0);
166 145