[PATCH 3/6] powerpc: numa: Use the right #ifdef guards around functions
From: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Date: 2018-02-20 16:17:25
Also in:
linux-mm, lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
of_node_to_nid and dump_numa_cpu_topology are declared inline in their respective header files, if CONFIG_NUMA is not set. Thus it is only valid to define these functions in numa.c if CONFIG_NUMA is set. (numa.c, despite the name, isn't conditionalized on CONFIG_NUMA, but CONFIG_NEED_MULTIPLE_NODES.) Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> --- arch/powerpc/mm/numa.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 0570bc2a0b13..df03a65b658f 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c@@ -254,6 +254,7 @@ static int of_node_to_nid_single(struct device_node *device) return nid; } +#ifdef CONFIG_NUMA /* Walk the device tree upwards, looking for an associativity id */ int of_node_to_nid(struct device_node *device) {
@@ -272,6 +273,7 @@ int of_node_to_nid(struct device_node *device) return nid; } EXPORT_SYMBOL(of_node_to_nid); +#endif static int __init find_min_common_depth(void) {
@@ -744,6 +746,7 @@ static void __init setup_nonnuma(void) } } +#ifdef CONFIG_NUMA void __init dump_numa_cpu_topology(void) { unsigned int node;
@@ -778,6 +781,7 @@ void __init dump_numa_cpu_topology(void) pr_cont("\n"); } } +#endif /* Initialize NODE_DATA for a node on the local memory */ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)
--
2.16.1