]> git.karo-electronics.de Git - linux-beck.git/commitdiff
microblaze: Sync noMMU and MMU setup_memory
authorMichal Simek <monstr@monstr.eu>
Thu, 27 May 2010 09:17:35 +0000 (11:17 +0200)
committerMichal Simek <monstr@monstr.eu>
Wed, 4 Aug 2010 08:22:30 +0000 (10:22 +0200)
Both versions can use the same node to register NODE_DATA(0)

Signed-off-by: Michal Simek <monstr@monstr.eu>
arch/microblaze/mm/init.c

index db5934989926d583d837ec51c752ac90eccba6ff..65eb00419d19dc8ac69e98cc2755b9cbc841d405 100644 (file)
@@ -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 */