From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 14 Feb 2011 10:55:18 +0000 (+0100)
Subject: Merge branch 'linus' into x86/bootmem
X-Git-Tag: v2.6.39-rc1~499^2~55^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d2137d5af4259f50c19addb8246a186c9ffac325

Merge branch 'linus' into x86/bootmem

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>
---

d2137d5af4259f50c19addb8246a186c9ffac325
diff --cc arch/x86/mm/numa_64.c
index 7cc26ae0a15d,95ea1551eebc..62cb634b5cf8
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@@ -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;
  }