Message ID | 1364319962-30967-3-git-send-email-cody@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Awaiting Upstream, archived |
Headers | show |
On Tue, Mar 26, 2013 at 10:46 AM, Cody P Schafer <cody@linux.vnet.ibm.com> wrote: > Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> > --- > arch/x86/mm/numa.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c > index 72fe01e..a71c4e2 100644 > --- 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(); For 1 and 2, Acked-by: Yinghai Lu <yinghai@kernel.org>
On 03/26/2013 10:56 AM, Yinghai Lu wrote: > > For 1 and 2, > > Acked-by: Yinghai Lu <yinghai@kernel.org> > Similarly: Acked-by: H. Peter Anvin <hpa@linux.intel.com> -hpa
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 72fe01e..a71c4e2 100644 --- 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++)
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> --- arch/x86/mm/numa.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)