From: Reza Arbab <arbab@linux.vnet.ibm.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Jonathan Corbet <corbet@lwn.net>,
Bharata B Rao <bharata@linux.vnet.ibm.com>,
Nathan Fontenot <nfont@linux.vnet.ibm.com>,
devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-doc@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] powerpc/mm: allow memory hotplug into a memoryless node
Date: Mon, 8 Aug 2016 13:27:22 -0500 [thread overview]
Message-ID: <1470680843-28702-4-git-send-email-arbab@linux.vnet.ibm.com> (raw)
In-Reply-To: <1470680843-28702-1-git-send-email-arbab@linux.vnet.ibm.com>
Remove the check which prevents us from hotplugging into an empty node.
Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com>
---
arch/powerpc/mm/numa.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 80d067d..bc70c4f 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1127,7 +1127,7 @@ static int hot_add_node_scn_to_nid(unsigned long scn_addr)
int hot_add_scn_to_nid(unsigned long scn_addr)
{
struct device_node *memory = NULL;
- int nid, found = 0;
+ int nid;
if (!numa_enabled || (min_common_depth < 0))
return first_online_node;
@@ -1143,17 +1143,6 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
if (nid < 0 || !node_online(nid))
nid = first_online_node;
- if (NODE_DATA(nid)->node_spanned_pages)
- return nid;
-
- for_each_online_node(nid) {
- if (NODE_DATA(nid)->node_spanned_pages) {
- found = 1;
- break;
- }
- }
-
- BUG_ON(!found);
return nid;
}
--
1.8.3.1
next prev parent reply other threads:[~2016-08-08 18:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-08 18:27 [PATCH 0/4] powerpc/mm: movable hotplug memory nodes Reza Arbab
2016-08-08 18:27 ` [PATCH 1/4] dt-bindings: add doc for ibm,hotplug-aperture Reza Arbab
2016-08-10 20:24 ` Rob Herring
2016-08-11 4:12 ` Balbir Singh
2016-08-11 4:39 ` Stewart Smith
2016-08-11 17:53 ` Reza Arbab
2016-08-08 18:27 ` [PATCH 2/4] powerpc/mm: create numa nodes for hotplug memory Reza Arbab
2016-08-12 1:43 ` Balbir Singh
2016-08-08 18:27 ` Reza Arbab [this message]
2016-08-12 1:50 ` [PATCH 3/4] powerpc/mm: allow memory hotplug into a memoryless node Balbir Singh
2016-08-12 17:24 ` Reza Arbab
2016-08-08 18:27 ` [PATCH 4/4] mm: enable CONFIG_MOVABLE_NODE on powerpc Reza Arbab
2016-08-10 10:30 ` [PATCH 0/4] powerpc/mm: movable hotplug memory nodes Michael Ellerman
2016-08-10 14:39 ` Nathan Fontenot
2016-08-10 18:43 ` Reza Arbab
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=1470680843-28702-4-git-send-email-arbab@linux.vnet.ibm.com \
--to=arbab@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bharata@linux.vnet.ibm.com \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=mpe@ellerman.id.au \
--cc=nfont@linux.vnet.ibm.com \
--cc=paulus@samba.org \
--cc=robh+dt@kernel.org \
/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).