diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2015-04-08 19:59:20 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-07-15 10:01:25 +0100 |
| commit | 0ce65816e20fcd5cf6388f5b56570f191bc05e4c (patch) | |
| tree | cde8c80f35837a50c311e5092a4e530f3198a86f /include | |
| parent | 7af6355eea6e842122018f094e2ff8ed9df39496 (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: Luis Henriques <luis.henriques@canonical.com>
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 db2f8ac18dad..55452d38ae06 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -580,7 +580,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( |