The patch titled Subject: x86, numa: kill useless code to improve code readability has been removed from the -mm tree. Its filename was x86-numa-kill-useless-code-to-improve-code-readability.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx> Subject: x86, numa: kill useless code to improve code readability According to x86 boot sequence, early_cpu_to_node() always returns NUMA_NO_NODE when called from numa_init(). So kill useless code to improve code readability. Related code sequence as below: x86_cpu_to_node_map is set until step 2, so it is still the default value (NUMA_NO_NODE) when accessed at step 1. start_kernel() setup_arch() initmem_init() x86_numa_init() numa_init() early_cpu_to_node() 1) return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu]; acpi_boot_init(); sfi_init() x86_dtb_init() generic_processor_info() early_per_cpu(x86_cpu_to_apicid, cpu) = apicid; init_cpu_to_node() numa_set_node(cpu, node); 2) per_cpu(x86_cpu_to_node_map, cpu) = node; rest_init() kernel_init() smp_init() native_cpu_up() start_secondary() numa_set_node() per_cpu(x86_cpu_to_node_map, cpu) = node; Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Mike Galbraith <umgwanakikbuti@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: "Rafael J . Wysocki" <rafael.j.wysocki@xxxxxxxxx> Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/numa.c | 10 ---------- 1 file changed, 10 deletions(-) diff -puN arch/x86/mm/numa.c~x86-numa-kill-useless-code-to-improve-code-readability arch/x86/mm/numa.c --- a/arch/x86/mm/numa.c~x86-numa-kill-useless-code-to-improve-code-readability +++ a/arch/x86/mm/numa.c @@ -593,8 +593,6 @@ static void __init numa_init_array(void) rr = first_node(node_online_map); for (i = 0; i < nr_cpu_ids; i++) { - if (early_cpu_to_node(i) != NUMA_NO_NODE) - continue; numa_set_node(i, rr); rr = next_node(rr, node_online_map); if (rr == MAX_NUMNODES) @@ -646,14 +644,6 @@ static int __init numa_init(int (*init_f if (ret < 0) return ret; - for (i = 0; i < nr_cpu_ids; i++) { - int nid = early_cpu_to_node(i); - - if (nid == NUMA_NO_NODE) - continue; - if (!node_online(nid)) - numa_clear_node(i); - } numa_init_array(); return 0; _ Patches currently in -mm which might be from jiang.liu@xxxxxxxxxxxxxxx are mm-update-_mem_id_-for-every-possible-cpu-when-memory-configuration-changes.patch mm-x86-enable-memoryless-node-support-to-better-support-cpu-memory-hotplug.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