The patch titled
x86_64: fix fake numa for machines with true srat
has been added to the -mm tree. Its filename is
x86_64-fix-fake-numa-for-machines-with-true-srat.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: fix fake numa for machines with true srat
From: David Rientjes <rientjes@xxxxxxxxxx>
Use the newly exported disable_srat() function to disable all SRAT detected
values before registering emulated node active regions or calling
setup_node_bootmem(). This ensures we are correctly srat_disabled() since we
never call acpi_scan_nodes() in the emulated case, even on true SRAT machines.
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86_64/mm/numa.c | 7 +------
1 files changed, 1 insertion(+), 6 deletions(-)
diff -puN arch/x86_64/mm/numa.c~x86_64-fix-fake-numa-for-machines-with-true-srat arch/x86_64/mm/numa.c
--- a/arch/x86_64/mm/numa.c~x86_64-fix-fake-numa-for-machines-with-true-srat
+++ a/arch/x86_64/mm/numa.c
@@ -463,6 +463,7 @@ done:
}
}
out:
+ disable_srat();
memnode_shift = compute_hash_shift(nodes, num_nodes);
if (memnode_shift < 0) {
memnode_shift = 0;
@@ -470,12 +471,6 @@ out:
"disabled.\n");
return -1;
}
-
- /*
- * We need to vacate all active ranges that may have been registered by
- * SRAT.
- */
- remove_all_active_ranges();
for_each_node_mask(i, node_possible_map) {
e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
nodes[i].end >> PAGE_SHIFT);
_
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-rename-and-export-bad_srat-to-kernel-code.patch
x86_64-rename-and-export-bad_srat-to-kernel-code-fix.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-fix-fake-numa-for-machines-with-true-srat.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
