From: H. Peter Anvin <hpa@linux.intel.com>
Date: Tue, 12 Oct 2010 00:05:11 +0000 (-0700)
Subject: Merge branch 'x86/urgent' into core/memblock
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e4029ee3517084ae00fbfbcb51cc365d8857061;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'x86/urgent' into core/memblock

Reason for merge:

Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree.

Resolved Conflicts:
	arch/x86/mm/srat_64.c

Originally-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

8e4029ee3517084ae00fbfbcb51cc365d8857061
diff --cc arch/x86/mm/srat_64.c
index 7f44eb62a5e9,9c0d0d399c30..a35cb9d8b060
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@@ -421,9 -420,11 +421,11 @@@ int __init acpi_scan_nodes(unsigned lon
  		return -1;
  	}
  
- 	for_each_node_mask(i, nodes_parsed)
- 		memblock_x86_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
- 						nodes[i].end >> PAGE_SHIFT);
+ 	for (i = 0; i < num_node_memblks; i++)
 -		e820_register_active_regions(memblk_nodeid[i],
++		memblock_x86_register_active_regions(memblk_nodeid[i],
+ 				node_memblk_range[i].start >> PAGE_SHIFT,
+ 				node_memblk_range[i].end >> PAGE_SHIFT);
+ 
  	/* for out of order entries in SRAT */
  	sort_node_map();
  	if (!nodes_cover_memory(nodes)) {