From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 May 2010 16:17:50 +0000 (-0700)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc1~510
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1f8caa986a5f4de2e40f3defe66a07b4c5a019c2;hp=-c

Merge branch 'x86-mm-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-64: Combine SRAT regions when possible
---

1f8caa986a5f4de2e40f3defe66a07b4c5a019c2
diff --combined arch/x86/mm/srat_64.c
index 38512d0c4742,3ebe6519bd87..f9897f7a9ef1
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@@ -363,6 -363,54 +363,54 @@@ int __init acpi_scan_nodes(unsigned lon
  	for (i = 0; i < MAX_NUMNODES; i++)
  		cutoff_node(i, start, end);
  
+ 	/*
+ 	 * Join together blocks on the same node, holes between
+ 	 * which don't overlap with memory on other nodes.
+ 	 */
+ 	for (i = 0; i < num_node_memblks; ++i) {
+ 		int j, k;
+ 
+ 		for (j = i + 1; j < num_node_memblks; ++j) {
+ 			unsigned long start, end;
+ 
+ 			if (memblk_nodeid[i] != memblk_nodeid[j])
+ 				continue;
+ 			start = min(node_memblk_range[i].end,
+ 			            node_memblk_range[j].end);
+ 			end = max(node_memblk_range[i].start,
+ 			          node_memblk_range[j].start);
+ 			for (k = 0; k < num_node_memblks; ++k) {
+ 				if (memblk_nodeid[i] == memblk_nodeid[k])
+ 					continue;
+ 				if (start < node_memblk_range[k].end &&
+ 				    end > node_memblk_range[k].start)
+ 					break;
+ 			}
+ 			if (k < num_node_memblks)
+ 				continue;
+ 			start = min(node_memblk_range[i].start,
+ 			            node_memblk_range[j].start);
+ 			end = max(node_memblk_range[i].end,
+ 			          node_memblk_range[j].end);
+ 			printk(KERN_INFO "SRAT: Node %d "
+ 			       "[%Lx,%Lx) + [%Lx,%Lx) -> [%lx,%lx)\n",
+ 			       memblk_nodeid[i],
+ 			       node_memblk_range[i].start,
+ 			       node_memblk_range[i].end,
+ 			       node_memblk_range[j].start,
+ 			       node_memblk_range[j].end,
+ 			       start, end);
+ 			node_memblk_range[i].start = start;
+ 			node_memblk_range[i].end = end;
+ 			k = --num_node_memblks - j;
+ 			memmove(memblk_nodeid + j, memblk_nodeid + j+1,
+ 				k * sizeof(*memblk_nodeid));
+ 			memmove(node_memblk_range + j, node_memblk_range + j+1,
+ 				k * sizeof(*node_memblk_range));
+ 			--j;
+ 		}
+ 	}
+ 
  	memnode_shift = compute_hash_shift(node_memblk_range, num_node_memblks,
  					   memblk_nodeid);
  	if (memnode_shift < 0) {
@@@ -461,8 -509,7 +509,8 @@@ void __init acpi_fake_nodes(const struc
  		 * node, it must now point to the fake node ID.
  		 */
  		for (j = 0; j < MAX_LOCAL_APIC; j++)
 -			if (apicid_to_node[j] == nid)
 +			if (apicid_to_node[j] == nid &&
 +			    fake_apicid_to_node[j] == NUMA_NO_NODE)
  				fake_apicid_to_node[j] = i;
  	}
  	for (i = 0; i < num_nodes; i++)