Merge commit 'v2.6.36-rc3' into x86/memblock

Conflicts:
	arch/x86/kernel/trampoline.c
	mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 6 deletions

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 32a702b621c8..840026c5bc56 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 */