Merge branch 'linus' into x86/bootmem
Ingo Molnar [Mon, 14 Feb 2011 10:55:18 +0000 (11:55 +0100)]
Conflicts:
arch/x86/mm/numa_64.c

Merge reason: fix the conflict, update to latest -rc and pick up this
              dependent fix from Yinghai:

  e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()

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

1  2 
arch/x86/kernel/aperture_64.c
arch/x86/kernel/setup.c
arch/x86/mm/amdtopology_64.c
arch/x86/mm/init.c
arch/x86/mm/numa_64.c
arch/x86/mm/srat_64.c
mm/page_alloc.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -590,13 -598,13 +598,14 @@@ static int __init numa_emulation(unsign
         * the e820 memory map.
         */
        remove_all_active_ranges();
 -      for_each_node_mask(i, node_possible_map) {
 +      for_each_node_mask(i, node_possible_map)
                memblock_x86_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
                                                nodes[i].end >> PAGE_SHIFT);
 +      init_memory_mapping_high();
 +      for_each_node_mask(i, node_possible_map)
                setup_node_bootmem(i, nodes[i].start, nodes[i].end);
-       acpi_fake_nodes(nodes, num_nodes);
 -      }
+       setup_physnodes(addr, max_addr, acpi, amd);
+       fake_physnodes(acpi, amd, num_nodes);
        numa_init_array();
        return 0;
  }
Simple merge
diff --cc mm/page_alloc.c
Simple merge