diff options
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 786adddf1a86..e34ea8adc1f9 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -31,6 +31,7 @@ | |||
31 | 31 | ||
32 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
33 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
34 | #include <asm/memblock.h> | ||
34 | 35 | ||
35 | #include "mm.h" | 36 | #include "mm.h" |
36 | 37 | ||
@@ -310,7 +311,6 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) | |||
310 | { | 311 | { |
311 | int i; | 312 | int i; |
312 | 313 | ||
313 | memblock_init(); | ||
314 | for (i = 0; i < mi->nr_banks; i++) | 314 | for (i = 0; i < mi->nr_banks; i++) |
315 | memblock_add(mi->bank[i].start, mi->bank[i].size); | 315 | memblock_add(mi->bank[i].start, mi->bank[i].size); |
316 | 316 | ||
@@ -349,7 +349,7 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) | |||
349 | if (mdesc->reserve) | 349 | if (mdesc->reserve) |
350 | mdesc->reserve(); | 350 | mdesc->reserve(); |
351 | 351 | ||
352 | memblock_analyze(); | 352 | memblock_allow_resize(); |
353 | memblock_dump_all(); | 353 | memblock_dump_all(); |
354 | } | 354 | } |
355 | 355 | ||