The patch titled Subject: x86/mm/numa: use setup_nr_node_ids() instead of opencoding. has been added to the -mm tree. Its filename is x86-mm-numa-use-setup_nr_node_ids-instead-of-opencoding.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Cody P Schafer <cody@xxxxxxxxxxxxxxxxxx> Subject: x86/mm/numa: use setup_nr_node_ids() instead of opencoding. Signed-off-by: Cody P Schafer <cody@xxxxxxxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/numa.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN arch/x86/mm/numa.c~x86-mm-numa-use-setup_nr_node_ids-instead-of-opencoding arch/x86/mm/numa.c --- a/arch/x86/mm/numa.c~x86-mm-numa-use-setup_nr_node_ids-instead-of-opencoding +++ a/arch/x86/mm/numa.c @@ -114,14 +114,11 @@ void numa_clear_node(int cpu) */ void __init setup_node_to_cpumask_map(void) { - unsigned int node, num = 0; + unsigned int node; /* setup nr_node_ids if not done yet */ - if (nr_node_ids == MAX_NUMNODES) { - for_each_node_mask(node, node_possible_map) - num = node; - nr_node_ids = num + 1; - } + if (nr_node_ids == MAX_NUMNODES) + setup_nr_node_ids(); /* allocate the map */ for (node = 0; node < nr_node_ids; node++) _ Patches currently in -mm which might be from cody@xxxxxxxxxxxxxxxxxx are page_alloc-make-setup_nr_node_ids-usable-for-arch-init-code.patch x86-mm-numa-use-setup_nr_node_ids-instead-of-opencoding.patch powerpc-mm-numa-use-setup_nr_node_ids-instead-of-opencoding.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