x86/mm/numa: use setup_nr_node_ids() instead of opencoding.

Signed-off-by: Cody P Schafer <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Acked-by: Yinghai Lu <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 72fe01e9e4144ac6293c3aa74c1196e864797193..a71c4e207679abf96c7b45747d84e6e7bac19bb0 100644 (file)
--- a/arch/x86/mm/numa.c
+++ b/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++)