diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2015-04-08 19:59:20 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-04 14:39:26 -0400 |
| commit | dd95eaaea493d74df5ae81c7e5846e6b33ee91b1 (patch) | |
| tree | 661b6b7bed092577b6085ba2a807a1df1698d9b6 | |
| parent | 3e2003cccc9fb5f73a0d251dbb595f4c6e3a08bd (diff) | |
of: return NUMA_NO_NODE from fallback of_node_to_nid()
[ Upstream commit c8fff7bc5bba6bd59cad40441c189c4efe7190f6 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/of/base.c | 2 | ||||
| -rw-r--r-- | 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 4c2ccde42427..469d2b7f47eb 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -88,7 +88,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 ce9f6a2b3532..4a6a489a7506 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -593,7 +593,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( |