Commit 7698906b authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Greg Kroah-Hartman

of: return NUMA_NO_NODE from fallback of_node_to_nid()

commit c8fff7bc upstream.

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: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fixes: 0c3f061c ("of: implement of_node_to_nid as a weak function")
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80c825f2
...@@ -77,7 +77,7 @@ EXPORT_SYMBOL(of_n_size_cells); ...@@ -77,7 +77,7 @@ EXPORT_SYMBOL(of_n_size_cells);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
int __weak of_node_to_nid(struct device_node *np) int __weak of_node_to_nid(struct device_node *np)
{ {
return numa_node_id(); return NUMA_NO_NODE;
} }
#endif #endif
......
...@@ -517,7 +517,10 @@ static inline const char *of_prop_next_string(struct property *prop, ...@@ -517,7 +517,10 @@ static inline const char *of_prop_next_string(struct property *prop,
#if defined(CONFIG_OF) && defined(CONFIG_NUMA) #if defined(CONFIG_OF) && defined(CONFIG_NUMA)
extern int of_node_to_nid(struct device_node *np); extern int of_node_to_nid(struct device_node *np);
#else #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 #endif
static inline struct device_node *of_find_matching_node( static inline struct device_node *of_find_matching_node(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment