From: Konstantin Khlebnikov Date: Wed, 8 Apr 2015 16:59:20 +0000 (+0300) Subject: of: return NUMA_NO_NODE from fallback of_node_to_nid() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c8fff7bc5bba6bd59cad40441c189c4efe7190f6;p=openwrt%2Fstaging%2Fblogic.git of: return NUMA_NO_NODE from fallback of_node_to_nid() 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") Signed-off-by: Grant Likely --- diff --git a/drivers/of/base.c b/drivers/of/base.c index 99764db0875a..8e39b38ca206 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; } #endif diff --git a/include/linux/of.h b/include/linux/of.h index ddeaae6d2083..ab071742c0c4 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -667,7 +667,10 @@ static inline void of_property_clear_flag(struct property *p, unsigned long flag #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(