| Message ID | 20200715120534.3673-2-srikar@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] powerpc/numa: Limit possible nodes to within num_possible_nodes | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (93c756af92e11df5c1a8be7a8360f28a97f7ad3f) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 27 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Srikar Dronamraju <srikar@linux.vnet.ibm.com> writes: > In of_drconf_to_nid_single() default_nid always refers to NUMA_NO_NODE. > Hence replace it with NUMA_NO_NODE. > > No functional changes. > ... > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index a2c5fe0d0cad..b066d89c2975 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -432,16 +432,15 @@ static int of_get_assoc_arrays(struct assoc_arrays *aa) > static int of_drconf_to_nid_single(struct drmem_lmb *lmb) > { > struct assoc_arrays aa = { .arrays = NULL }; > - int default_nid = NUMA_NO_NODE; > - int nid = default_nid; > + int nid = NUMA_NO_NODE; > int rc, index; > > if ((min_common_depth < 0) || !numa_enabled) > - return default_nid; > + return NUMA_NO_NODE; > > rc = of_get_assoc_arrays(&aa); > if (rc) > - return default_nid; > + return NUMA_NO_NODE; > > if (min_common_depth <= aa.array_sz && > !(lmb->flags & DRCONF_MEM_AI_INVALID) && lmb->aa_index < aa.n_arrays) { > @@ -449,7 +448,7 @@ static int of_drconf_to_nid_single(struct drmem_lmb *lmb) > nid = of_read_number(&aa.arrays[index], 1); > > if (nid == 0xffff || nid >= num_possible_nodes()) > - nid = default_nid; > + nid = NUMA_NO_NODE; > > if (nid > 0) { > index = lmb->aa_index * aa.array_sz; Doesn't seem like an improvement to me, sorry. Admittedly it's a small point, but a local variable named "default_nid" communicates that it's a default or fallback value. That information is lost with this change.
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index a2c5fe0d0cad..b066d89c2975 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -432,16 +432,15 @@ static int of_get_assoc_arrays(struct assoc_arrays *aa) static int of_drconf_to_nid_single(struct drmem_lmb *lmb) { struct assoc_arrays aa = { .arrays = NULL }; - int default_nid = NUMA_NO_NODE; - int nid = default_nid; + int nid = NUMA_NO_NODE; int rc, index; if ((min_common_depth < 0) || !numa_enabled) - return default_nid; + return NUMA_NO_NODE; rc = of_get_assoc_arrays(&aa); if (rc) - return default_nid; + return NUMA_NO_NODE; if (min_common_depth <= aa.array_sz && !(lmb->flags & DRCONF_MEM_AI_INVALID) && lmb->aa_index < aa.n_arrays) { @@ -449,7 +448,7 @@ static int of_drconf_to_nid_single(struct drmem_lmb *lmb) nid = of_read_number(&aa.arrays[index], 1); if (nid == 0xffff || nid >= num_possible_nodes()) - nid = default_nid; + nid = NUMA_NO_NODE; if (nid > 0) { index = lmb->aa_index * aa.array_sz;
In of_drconf_to_nid_single() default_nid always refers to NUMA_NO_NODE. Hence replace it with NUMA_NO_NODE. No functional changes. Cc: linuxppc-dev <linuxppc-dev@lists.ozlabs.org> Cc: Michael Ellerman <michaele@au1.ibm.com> Cc: Nathan Lynch <nathanl@linux.ibm.com> Cc: Tyrel Datwyler <tyreld@linux.ibm.com> Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> --- arch/powerpc/mm/numa.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)