diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:14:26 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:14:26 -0500 |
commit | 45aa0663cc408617b79a2b53f0a5f50e94688a48 (patch) | |
tree | 0a53931c317c3c72a3555bd2fbb70a881ee870f2 /arch/unicore32/mm/init.c | |
parent | 511585a28e5b5fd1cac61e601e42efc4c5dd64b5 (diff) | |
parent | 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 (diff) |
Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock
Diffstat (limited to 'arch/unicore32/mm/init.c')
-rw-r--r-- | arch/unicore32/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c index 3b379cddbc6..de186bde897 100644 --- a/arch/unicore32/mm/init.c +++ b/arch/unicore32/mm/init.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
27 | #include <asm/sizes.h> | 27 | #include <asm/sizes.h> |
28 | #include <asm/tlb.h> | 28 | #include <asm/tlb.h> |
29 | #include <asm/memblock.h> | ||
29 | #include <mach/map.h> | 30 | #include <mach/map.h> |
30 | 31 | ||
31 | #include "mm.h" | 32 | #include "mm.h" |
@@ -245,7 +246,6 @@ void __init uc32_memblock_init(struct meminfo *mi) | |||
245 | sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), | 246 | sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), |
246 | meminfo_cmp, NULL); | 247 | meminfo_cmp, NULL); |
247 | 248 | ||
248 | memblock_init(); | ||
249 | for (i = 0; i < mi->nr_banks; i++) | 249 | for (i = 0; i < mi->nr_banks; i++) |
250 | memblock_add(mi->bank[i].start, mi->bank[i].size); | 250 | memblock_add(mi->bank[i].start, mi->bank[i].size); |
251 | 251 | ||
@@ -264,7 +264,7 @@ void __init uc32_memblock_init(struct meminfo *mi) | |||
264 | 264 | ||
265 | uc32_mm_memblock_reserve(); | 265 | uc32_mm_memblock_reserve(); |
266 | 266 | ||
267 | memblock_analyze(); | 267 | memblock_allow_resize(); |
268 | memblock_dump_all(); | 268 | memblock_dump_all(); |
269 | } | 269 | } |
270 | 270 | ||