The patch titled x86_64: more fixes to node_possible_map runtime setup has been removed from the -mm tree. Its filename was x86_64-set-node_possible_map-at-runtime-fix-2.patch This patch was dropped because it was folded into x86_64-set-node_possible_map-at-runtime.patch ------------------------------------------------------ Subject: x86_64: more fixes to node_possible_map runtime setup From: Suresh Siddha <suresh.b.siddha@xxxxxxxxx> More fixes in the failure cases and a small cleanup in numa emulation case. Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86_64/mm/numa.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff -puN arch/x86_64/mm/numa.c~x86_64-set-node_possible_map-at-runtime-fix-2 arch/x86_64/mm/numa.c --- a/arch/x86_64/mm/numa.c~x86_64-set-node_possible_map-at-runtime-fix-2 +++ a/arch/x86_64/mm/numa.c @@ -295,7 +295,6 @@ static int __init setup_node_range(int n ret = -1; } nodes[nid].end = *addr; - node_set_online(nid); node_set(nid, node_possible_map); printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid, nodes[nid].start, nodes[nid].end, @@ -480,7 +479,7 @@ out: * SRAT. */ remove_all_active_ranges(); - for_each_online_node(i) { + for_each_node_mask(i, node_possible_map) { e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT, nodes[i].end >> PAGE_SHIFT); setup_node_bootmem(i, nodes[i].start, nodes[i].end); @@ -507,11 +506,13 @@ void __init numa_initmem_init(unsigned l if (!numa_off && !acpi_scan_nodes(start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT)) return; + nodes_clear(node_possible_map); #endif #ifdef CONFIG_K8_NUMA if (!numa_off && !k8_scan_nodes(start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT)) return; + nodes_clear(node_possible_map); #endif printk(KERN_INFO "%s\n", numa_off ? "NUMA turned off" : "No NUMA configuration found"); _ Patches currently in -mm which might be from suresh.b.siddha@xxxxxxxxx are x86_64-set-node_possible_map-at-runtime.patch x86_64-set-node_possible_map-at-runtime-fix-2.patch slab-x86_64-skip-cache_free_alien-on-non-numa.patch pad-irq_desc-to-internode-cacheline-size.patch pad-irq_desc-to-internode-cacheline-size-fix.patch sched-fix-idle-load-balancing-in-softirqd-context.patch sched-fix-idle-load-balancing-in-softirqd-context-fix.patch sched-dynticks-idle-load-balancing-v3.patch sched-optimize-siblings-status-check-logic-in-wake_idle.patch sched-align-rq-to-cacheline-boundary.patch sched-dont-renice-kernel-threads.patch sched-remove-sleepavg-from-proc.patch sched-implement-staircase-deadline-cpu-scheduler.patch sched-implement-staircase-deadline-cpu-scheduler-misc-fixes.patch sched-remove-noninteractive-flag.patch sched-document-sd-cpu-scheduler.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html