[PATCH] highest_possible_node_id() linkage fix
Qooting Adrian: - net/sunrpc/svc.c uses highest_possible_node_id() - include/linux/nodemask.h says highest_possible_node_id() is out-of-line #if MAX_NUMNODES > 1 - the out-of-line highest_possible_node_id() is in lib/cpumask.c - lib/Makefile: lib-$(CONFIG_SMP) += cpumask.o CONFIG_ARCH_DISCONTIGMEM_ENABLE=y, CONFIG_SMP=n, CONFIG_SUNRPC=y -> highest_possible_node_id() is used in net/sunrpc/svc.c CONFIG_NODES_SHIFT defined and > 0 -> include/linux/numa.h: MAX_NUMNODES > 1 -> compile error The bug is not present on architectures where ARCH_DISCONTIGMEM_ENABLE depends on NUMA (but m32r isn't the only affected architecture). So move the function into page_alloc.c Cc: Adrian Bunk <bunk@stusta.de> Cc: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
e51959faa6
Коммит
6220ec7844
|
@ -43,19 +43,3 @@ int __any_online_cpu(const cpumask_t *mask)
|
||||||
return cpu;
|
return cpu;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(__any_online_cpu);
|
EXPORT_SYMBOL(__any_online_cpu);
|
||||||
|
|
||||||
#if MAX_NUMNODES > 1
|
|
||||||
/*
|
|
||||||
* Find the highest possible node id.
|
|
||||||
*/
|
|
||||||
int highest_possible_node_id(void)
|
|
||||||
{
|
|
||||||
unsigned int node;
|
|
||||||
unsigned int highest = 0;
|
|
||||||
|
|
||||||
for_each_node_mask(node, node_possible_map)
|
|
||||||
highest = node;
|
|
||||||
return highest;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(highest_possible_node_id);
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -3120,3 +3120,19 @@ unsigned long page_to_pfn(struct page *page)
|
||||||
EXPORT_SYMBOL(pfn_to_page);
|
EXPORT_SYMBOL(pfn_to_page);
|
||||||
EXPORT_SYMBOL(page_to_pfn);
|
EXPORT_SYMBOL(page_to_pfn);
|
||||||
#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
|
#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
|
||||||
|
|
||||||
|
#if MAX_NUMNODES > 1
|
||||||
|
/*
|
||||||
|
* Find the highest possible node id.
|
||||||
|
*/
|
||||||
|
int highest_possible_node_id(void)
|
||||||
|
{
|
||||||
|
unsigned int node;
|
||||||
|
unsigned int highest = 0;
|
||||||
|
|
||||||
|
for_each_node_mask(node, node_possible_map)
|
||||||
|
highest = node;
|
||||||
|
return highest;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(highest_possible_node_id);
|
||||||
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче