Messages in this thread | | | Date | Fri, 16 Jul 2010 09:29:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the microblaze tree with the Linus' tree |
| |
Hi Michal,
Today's linux-next merge of the microblaze tree got a conflict in arch/microblaze/mm/init.c between commit 95f72d1ed41a66f1c1c29c24d479de81a0bea36f ("lmb: rename to memblock") from Linus' tree and commit c30842ca4d432f553f53d4d6849523fd9b8ebb40 ("microblaze: Sync noMMU and MMU setup_memory") from the microblaze tree.
Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/microblaze/mm/init.c index db59349,573b97e..0000000 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@@ -134,14 -134,9 +134,9 @@@ 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 - lmb_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); + memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); /* free bootmem is whole main memory */ free_bootmem(memory_start, memory_size);
| |