From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752478AbcHHS1f (ORCPT ); Mon, 8 Aug 2016 14:27:35 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:15588 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752363AbcHHS1c (ORCPT ); Mon, 8 Aug 2016 14:27:32 -0400 X-IBM-Helo: d01dlp01.pok.ibm.com X-IBM-MailFrom: arbab@linux.vnet.ibm.com From: Reza Arbab To: Rob Herring , Mark Rutland , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Jonathan Corbet , Bharata B Rao , Nathan Fontenot , 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 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470680843-28702-1-git-send-email-arbab@linux.vnet.ibm.com> References: <1470680843-28702-1-git-send-email-arbab@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16080818-0044-0000-0000-000000DCA2F7 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005567; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000178; SDB=6.00741845; UDB=6.00349120; IPR=6.00514403; BA=6.00004651; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012249; XFM=3.00000011; UTC=2016-08-08 18:27:28 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16080818-0045-0000-0000-000004F2E573 Message-Id: <1470680843-28702-4-git-send-email-arbab@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-08-08_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608080184 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the check which prevents us from hotplugging into an empty node. Signed-off-by: Reza Arbab --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Reza Arbab Subject: [PATCH 3/4] powerpc/mm: allow memory hotplug into a memoryless node Date: Mon, 8 Aug 2016 13:27:22 -0500 Message-ID: <1470680843-28702-4-git-send-email-arbab@linux.vnet.ibm.com> References: <1470680843-28702-1-git-send-email-arbab@linux.vnet.ibm.com> Return-path: In-Reply-To: <1470680843-28702-1-git-send-email-arbab@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org To: Rob Herring , Mark Rutland , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Jonathan Corbet , Bharata B Rao , Nathan Fontenot , devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org Remove the check which prevents us from hotplugging into an empty node. Signed-off-by: Reza Arbab --- 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 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org