aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/mm.h6
-rw-r--r--mm/page_alloc.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6d7266842abd..7aa11a6736eb 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1816,5 +1816,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
1816static inline bool page_is_guard(struct page *page) { return false; } 1816static inline bool page_is_guard(struct page *page) { return false; }
1817#endif /* CONFIG_DEBUG_PAGEALLOC */ 1817#endif /* CONFIG_DEBUG_PAGEALLOC */
1818 1818
1819#if MAX_NUMNODES > 1
1820void __init setup_nr_node_ids(void);
1821#else
1822static inline void setup_nr_node_ids(void) {}
1823#endif
1824
1819#endif /* __KERNEL__ */ 1825#endif /* __KERNEL__ */
1820#endif /* _LINUX_MM_H */ 1826#endif /* _LINUX_MM_H */
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5a234b64f3ac..98cbdf6e5532 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4749,7 +4749,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
4749/* 4749/*
4750 * Figure out the number of possible node ids. 4750 * Figure out the number of possible node ids.
4751 */ 4751 */
4752static void __init setup_nr_node_ids(void) 4752void __init setup_nr_node_ids(void)
4753{ 4753{
4754 unsigned int node; 4754 unsigned int node;
4755 unsigned int highest = 0; 4755 unsigned int highest = 0;
@@ -4758,10 +4758,6 @@ static void __init setup_nr_node_ids(void)
4758 highest = node; 4758 highest = node;
4759 nr_node_ids = highest + 1; 4759 nr_node_ids = highest + 1;
4760} 4760}
4761#else
4762static inline void setup_nr_node_ids(void)
4763{
4764}
4765#endif 4761#endif
4766 4762
4767/** 4763/**