[DEBUG 07/12] powerpc/mm: Allow memory hotplug into a memory less node

From	Anshuman Khandual <khandual@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	[DEBUG 07/12] powerpc/mm: Allow memory hotplug into a memory less node
Date	2016-11-22 15:30 +0100
Message-ID	<sGkf7-8lc-9@gated-at.bofh.it> (permalink)
References	<sGkf7-8lc-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Reza Arbab <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>
Signed-off-by: Anshuman Khandual <khandual@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 e4cb4e62..4086ff7 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1103,7 +1103,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;
@@ -1119,17 +1119,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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[DEBUG 07/12] powerpc/mm: Allow memory hotplug into a memory less node Anshuman Khandual <khandual@linux.vnet.ibm.com> - 2016-11-22 15:30 +0100

csiph-web