Merge branch 'x86/urgent' into core/memblock
H. Peter Anvin [Tue, 12 Oct 2010 00:05:11 +0000 (17:05 -0700)]
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>

1  2 
arch/x86/mm/srat_64.c
mm/page_alloc.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)) {
diff --cc mm/page_alloc.c
Simple merge