Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754323AbbDMNWw (ORCPT ); Mon, 13 Apr 2015 09:22:52 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:35957 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753572AbbDMNWs (ORCPT ); Mon, 13 Apr 2015 09:22:48 -0400 MIME-Version: 1.0 In-Reply-To: <20150408165920.25007.6869.stgit@buzz> References: <20150408165920.25007.6869.stgit@buzz> From: Rob Herring Date: Mon, 13 Apr 2015 08:22:26 -0500 Message-ID: Subject: Re: [PATCH] of: return NUMA_NO_NODE from fallback of_node_to_nid() To: Konstantin Khlebnikov Cc: Grant Likely , "devicetree@vger.kernel.org" , Rob Herring , "linux-kernel@vger.kernel.org" , sparclinux@vger.kernel.org, "linux-mm@kvack.org" , linuxppc-dev Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2007 Lines: 57 On Wed, Apr 8, 2015 at 11:59 AM, Konstantin Khlebnikov wrote: > Node 0 might be offline as well as any other numa node, > in this case kernel cannot handle memory allocation and crashes. > > Signed-off-by: Konstantin Khlebnikov > Fixes: 0c3f061c195c ("of: implement of_node_to_nid as a weak function") > --- > drivers/of/base.c | 2 +- > include/linux/of.h | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 8f165b112e03..51f4bd16e613 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -89,7 +89,7 @@ EXPORT_SYMBOL(of_n_size_cells); > #ifdef CONFIG_NUMA > int __weak of_node_to_nid(struct device_node *np) > { > - return numa_node_id(); > + return NUMA_NO_NODE; This is going to break any NUMA machine that enables OF and expects the weak function to work. Rob > } > #endif > > diff --git a/include/linux/of.h b/include/linux/of.h > index dfde07e77a63..78a04ee85a9c 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -623,7 +623,10 @@ static inline const char *of_prop_next_string(struct property *prop, > #if defined(CONFIG_OF) && defined(CONFIG_NUMA) > extern int of_node_to_nid(struct device_node *np); > #else > -static inline int of_node_to_nid(struct device_node *device) { return 0; } > +static inline int of_node_to_nid(struct device_node *device) > +{ > + return NUMA_NO_NODE; > +} > #endif > > static inline struct device_node *of_find_matching_node( > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/