From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nathan Lynch <nathanl@linux.ibm.com>,
Tyrel Datwyler <tyreld@linux.ibm.com>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
Michael Ellerman <michaele@au1.ibm.com>
Subject: [PATCH 2/2] powerpc/numa: Remove a redundant variable
Date: Wed, 15 Jul 2020 17:35:34 +0530 [thread overview]
Message-ID: <20200715120534.3673-2-srikar@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200715120534.3673-1-srikar@linux.vnet.ibm.com>
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(-)
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;
--
2.18.2
next prev parent reply other threads:[~2020-07-15 12:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 6:40 [PATCH] powerpc/numa: Restrict possible nodes based on platform Srikar Dronamraju
2020-07-06 20:58 ` Tyrel Datwyler
2020-07-07 0:44 ` Nathan Lynch
2020-07-07 2:53 ` Srikar Dronamraju
2020-07-07 2:50 ` Srikar Dronamraju
2020-07-06 23:19 ` Nathan Lynch
2020-07-07 5:02 ` Michael Ellerman
2020-07-07 8:42 ` Srikar Dronamraju
2020-07-10 17:41 ` Nathan Lynch
2020-07-15 12:05 ` [PATCH 1/2] powerpc/numa: Limit possible nodes to within num_possible_nodes Srikar Dronamraju
2020-07-15 12:05 ` Srikar Dronamraju [this message]
2020-07-22 3:28 ` [PATCH 2/2] powerpc/numa: Remove a redundant variable Nathan Lynch
2020-07-22 3:14 ` [PATCH 1/2] powerpc/numa: Limit possible nodes to within num_possible_nodes Nathan Lynch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200715120534.3673-2-srikar@linux.vnet.ibm.com \
--to=srikar@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=michaele@au1.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=nathanl@linux.ibm.com \
--cc=tyreld@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).