The patch titled x86_64 numa: fake apicid_to_node mapping for fake numa has been removed from the -mm tree. Its filename was x86_64-numa-fake-apicid_to_node-mapping-for-fake-numa.patch This patch was dropped because it was withdrawn ------------------------------------------------------ Subject: x86_64 numa: fake apicid_to_node mapping for fake numa From: David Rientjes <rientjes@xxxxxxxxxx> When we are in the emulated NUMA case, we need to make sure that all existing apicid_to_node mappings that point to real node ID's now point to the equivalent fake node ID's. Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86_64/mm/srat.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletion(-) diff -puN arch/x86_64/mm/srat.c~x86_64-numa-fake-apicid_to_node-mapping-for-fake-numa arch/x86_64/mm/srat.c --- a/arch/x86_64/mm/srat.c~x86_64-numa-fake-apicid_to_node-mapping-for-fake-numa +++ a/arch/x86_64/mm/srat.c @@ -472,7 +472,7 @@ static int __init find_node_by_addr(cons */ void __init acpi_fake_nodes(const struct bootnode *fake_nodes, int num_nodes) { - int i; + int i, j; printk(KERN_INFO "Faking PXM affinity for fake nodes on real " "topology.\n"); @@ -486,6 +486,13 @@ void __init acpi_fake_nodes(const struct if (nid == NUMA_NO_NODE) continue; __acpi_map_pxm_to_node(pxm, nid); + /* + * For each apicid-to-node mapping that exists for this real + * node, it must now point to the fake node ID. + */ + for (j = 0; j < MAX_LOCAL_APIC; j++) + if (apicid_to_node[j] == i) + apicid_to_node[j] = nid; } nodes_clear(nodes_parsed); _ Patches currently in -mm which might be from rientjes@xxxxxxxxxx are origin.patch git-alsa.patch powerpc-ps3-use-__maybe_unused.patch mips-excite-use-__maybe_unused.patch mips-tlbex-use-__maybe_unused.patch scsi-fix-ambiguous-gdthtable-definition.patch x86_64-extract-helper-function-from-e820_register_active_regions.patch x86_64-extract-helper-function-from-e820_register_active_regions-fix.patch x86_64-fix-e820_hole_size-based-on-address-ranges.patch x86_64-acpi-disable-srat-when-numa-emulation-succeeds.patch x86_64-numa-fake-apicid_to_node-mapping-for-fake-numa.patch maps2-uninline-some-functions-in-the-page-walker.patch maps2-eliminate-the-pmd_walker-struct-in-the-page-walker.patch maps2-remove-vma-from-args-in-the-page-walker.patch maps2-propagate-errors-from-callback-in-page-walker.patch maps2-add-callbacks-for-each-level-to-page-walker.patch maps2-move-the-page-walker-code-to-lib.patch maps2-simplify-interdependence-of-proc-pid-maps-and-smaps.patch maps2-move-clear_refs-code-to-task_mmuc.patch maps2-regroup-task_mmu-by-interface.patch maps2-make-proc-pid-smaps-optional-under-config_embedded.patch maps2-make-proc-pid-clear_refs-option-under-config_embedded.patch maps2-add-proc-pid-pagemap-interface.patch maps2-add-proc-kpagemap-interface.patch frv-gdb-use-__maybe_unused.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