AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

of: return NUMA_NO_NODE from fallback of_node_to_nid()

Browse Source 
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: 0c3f061c19 ("of: implement of_node_to_nid as a weak function")
Signed-off-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
Konstantin Khlebnikov 2015-04-08 19:59:20 +03:00 committed by Grant Likely
parent ba155e2d21
commit c8fff7bc5b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/of/base.c
View File

@ -89,7 +89,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

5
include/linux/of.h
View File

@ -667,7 +667,10 @@ static inline void of_property_clear_flag(struct property *p, unsigned long flag
#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(