aboutsummaryrefslogtreecommitdiff
path: root/include/linux/of.h
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <khlebnikov@yandex-team.ru>2015-04-08 19:59:20 +0300
committerGrant Likely <grant.likely@linaro.org>2015-06-04 14:39:52 +0900
commitc8fff7bc5bba6bd59cad40441c189c4efe7190f6 (patch)
tree20680226822a5f94e7bc5b15ce8b6802b562224a /include/linux/of.h
parentba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff)
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 <khlebnikov@yandex-team.ru> Fixes: 0c3f061c195c ("of: implement of_node_to_nid as a weak function") Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'include/linux/of.h')
-rw-r--r--include/linux/of.h5
1 files changed, 4 insertions, 1 deletions
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(