diff options
author | Michal Simek <monstr@monstr.eu> | 2010-05-27 05:17:35 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-08-04 04:22:30 -0400 |
commit | e05816679b61e47e90d7455a8f6dc6126dc479e3 (patch) | |
tree | 2e0ce81539e01297d1aff407f6934b6571fe6dba /arch/microblaze/mm | |
parent | ef78705034763ebdf500695deaed599c481318a7 (diff) |
microblaze: Sync noMMU and MMU setup_memory
Both versions can use the same node to register NODE_DATA(0)
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/mm')
-rw-r--r-- | arch/microblaze/mm/init.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index db5934989926..65eb00419d19 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
@@ -134,13 +134,8 @@ void __init setup_memory(void) | |||
134 | * for 4GB of memory, using 4kB pages), plus 1 page | 134 | * for 4GB of memory, using 4kB pages), plus 1 page |
135 | * (in case the address isn't page-aligned). | 135 | * (in case the address isn't page-aligned). |
136 | */ | 136 | */ |
137 | #ifndef CONFIG_MMU | 137 | map_size = init_bootmem_node(NODE_DATA(0), |
138 | map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)klimit)), | ||
139 | min_low_pfn, max_low_pfn); | ||
140 | #else | ||
141 | map_size = init_bootmem_node(&contig_page_data, | ||
142 | PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); | 138 | PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); |
143 | #endif | ||
144 | memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); | 139 | memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); |
145 | 140 | ||
146 | /* free bootmem is whole main memory */ | 141 | /* free bootmem is whole main memory */ |