diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2015-04-08 19:59:20 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-03 09:29:16 -0700 |
commit | 34f94b18c76f5912815cb1612f40deb7fcb4d0f6 (patch) | |
tree | 0b621fa3a0cf66a64eea206b1b066a87bf51ee97 /include | |
parent | 4473d8ccadce054ba37c02f1cf131ae007a5e32e (diff) |
of: return NUMA_NO_NODE from fallback of_node_to_nid()
commit c8fff7bc5bba6bd59cad40441c189c4efe7190f6 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: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/of.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index b871ff9d81d7..8135d507d089 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -673,7 +673,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( |