For non-NUMA, it turns out that numa_init_array() has no operations. Make
separated definition for non-NUMA and NUMA, so later they can be combined
into their counterpart init_cpu_to_node().
Signed-off-by: Pingfan Liu <kernelf...@gmail.com>
CC: Thomas Gleixner <t...@linutronix.de>
CC: Ingo Molnar <mi...@redhat.com>
CC: Borislav Petkov <b...@alien8.de>
CC: "H. Peter Anvin" <h...@zytor.com>
CC: Dave Hansen <dave.han...@linux.intel.com>
CC: Vlastimil Babka <vba...@suse.cz>
CC: Mike Rapoport <r...@linux.vnet.ibm.com>
CC: Andrew Morton <a...@linux-foundation.org>
CC: Mel Gorman <mgor...@suse.de>
CC: Joonsoo Kim <iamjoonsoo....@lge.com>
CC: Andy Lutomirski <l...@kernel.org>
CC: Andi Kleen <a...@linux.intel.com>
CC: Petr Tesarik <ptesa...@suse.cz>
CC: Michal Hocko <mho...@suse.com>
CC: Stephen Rothwell <s...@canb.auug.org.au>
CC: Jonathan Corbet <cor...@lwn.net>
CC: Nicholas Piggin <npig...@gmail.com>
CC: Daniel Vacek <ne...@redhat.com>
CC: linux-kernel@vger.kernel.org
---
arch/x86/mm/numa.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 1308f54..bfe6732 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -599,6 +599,7 @@ static int __init numa_register_memblks(struct numa_meminfo
*mi)
return 0;
}
+#ifdef CONFIG_NUMA
/*
* There are unfortunately some poorly designed mainboards around that
* only connect memory to a single CPU. This breaks the 1:1 cpu->node
@@ -618,6 +619,9 @@ static void __init numa_init_array(void)
rr = next_node_in(rr, node_online_map);
}
}
+#else
+static void __init numa_init_array(void) {}
+#endif
static int __init numa_init(int (*init_func)(void))
{
--
2.7.4
