aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/init.c')
-rw-r--r--arch/arm/mm/init.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 4877e06308b7..99d6bc9b89bb 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -271,7 +271,7 @@ static void arm_memory_present(struct meminfo *mi)
271} 271}
272#endif 272#endif
273 273
274void __init arm_memblock_init(struct meminfo *mi) 274void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
275{ 275{
276 int i; 276 int i;
277 277
@@ -297,11 +297,15 @@ void __init arm_memblock_init(struct meminfo *mi)
297 297
298 arm_mm_memblock_reserve(); 298 arm_mm_memblock_reserve();
299 299
300 /* reserve any platform specific memblock areas */
301 if (mdesc->reserve)
302 mdesc->reserve();
303
300 memblock_analyze(); 304 memblock_analyze();
301 memblock_dump_all(); 305 memblock_dump_all();
302} 306}
303 307
304void __init bootmem_init(struct machine_desc *mdesc) 308void __init bootmem_init(void)
305{ 309{
306 struct meminfo *mi = &meminfo; 310 struct meminfo *mi = &meminfo;
307 unsigned long min, max_low, max_high; 311 unsigned long min, max_low, max_high;
@@ -312,9 +316,6 @@ void __init bootmem_init(struct machine_desc *mdesc)
312 316
313 arm_bootmem_init(mi, min, max_low); 317 arm_bootmem_init(mi, min, max_low);
314 318
315 if (mdesc->reserve)
316 mdesc->reserve();
317
318 /* 319 /*
319 * Sparsemem tries to allocate bootmem in memory_present(), 320 * Sparsemem tries to allocate bootmem in memory_present(),
320 * so must be done after the fixed reservations 321 * so must be done after the fixed reservations