From: Michal Simek Date: Thu, 27 May 2010 09:17:35 +0000 (+0200) Subject: microblaze: Sync noMMU and MMU setup_memory X-Git-Tag: v2.6.36-rc1~560^2~44 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e05816679b61e47e90d7455a8f6dc6126dc479e3;p=karo-tx-linux.git microblaze: Sync noMMU and MMU setup_memory Both versions can use the same node to register NODE_DATA(0) Signed-off-by: Michal Simek --- 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) * for 4GB of memory, using 4kB pages), plus 1 page * (in case the address isn't page-aligned). */ -#ifndef CONFIG_MMU - map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)klimit)), - min_low_pfn, max_low_pfn); -#else - map_size = init_bootmem_node(&contig_page_data, + map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); -#endif memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); /* free bootmem is whole main memory */