Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / microblaze / mm / init.c

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index db5934989926d583d837ec51c752ac90eccba6ff..65eb00419d19dc8ac69e98cc2755b9cbc841d405 100644 (file)
--- 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 */