Michal Suchanek f24ccf
From c1e150ceb61e4a585bad156da15c33bfe89f5858 Mon Sep 17 00:00:00 2001
Michal Suchanek f24ccf
From: Corentin Labbe <clabbe@baylibre.com>
Michal Suchanek f24ccf
Date: Wed, 14 Feb 2018 12:17:47 +0000
Michal Suchanek f24ccf
Subject: [PATCH] powerpc/pseries: Add empty update_numa_cpu_lookup_table() for
Michal Suchanek f24ccf
 NUMA=n
Michal Suchanek f24ccf
MIME-Version: 1.0
Michal Suchanek f24ccf
Content-Type: text/plain; charset=UTF-8
Michal Suchanek f24ccf
Content-Transfer-Encoding: 8bit
Michal Suchanek f24ccf
Michal Suchanek f24ccf
References: bsc#1181674 ltc#189159
Michal Suchanek f24ccf
Patch-mainline: v4.16-rc2
Michal Suchanek f24ccf
Git-commit: c1e150ceb61e4a585bad156da15c33bfe89f5858
Michal Suchanek f24ccf
Michal Suchanek f24ccf
When CONFIG_NUMA is not set, the build fails with:
Michal Suchanek f24ccf
Michal Suchanek f24ccf
  arch/powerpc/platforms/pseries/hotplug-cpu.c:335:4:
Michal Suchanek f24ccf
  error: déclaration implicite de la fonction « update_numa_cpu_lookup_table »
Michal Suchanek f24ccf
Michal Suchanek f24ccf
So we have to add update_numa_cpu_lookup_table() as an empty function
Michal Suchanek f24ccf
when CONFIG_NUMA is not set.
Michal Suchanek f24ccf
Michal Suchanek f24ccf
Fixes: 1d9a090783be ("powerpc/numa: Invalidate numa_cpu_lookup_table on cpu remove")
Michal Suchanek f24ccf
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Michal Suchanek f24ccf
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Michal Suchanek f24ccf
Acked-by: Michal Suchanek <msuchanek@suse.de>
Michal Suchanek f24ccf
---
Michal Suchanek f24ccf
 arch/powerpc/include/asm/topology.h | 3 +++
Michal Suchanek f24ccf
 1 file changed, 3 insertions(+)
Michal Suchanek f24ccf
Michal Suchanek f24ccf
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
Michal Suchanek f24ccf
index 593248110902..9f421641a35c 100644
Michal Suchanek f24ccf
--- a/arch/powerpc/include/asm/topology.h
Michal Suchanek f24ccf
+++ b/arch/powerpc/include/asm/topology.h
Michal Suchanek f24ccf
@@ -81,6 +81,9 @@ static inline int numa_update_cpu_topology(bool cpus_locked)
Michal Suchanek f24ccf
 {
Michal Suchanek f24ccf
 	return 0;
Michal Suchanek f24ccf
 }
Michal Suchanek f24ccf
+
Michal Suchanek f24ccf
+static inline void update_numa_cpu_lookup_table(unsigned int cpu, int node) {}
Michal Suchanek f24ccf
+
Michal Suchanek f24ccf
 #endif /* CONFIG_NUMA */
Michal Suchanek f24ccf
 
Michal Suchanek f24ccf
 #if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)
Michal Suchanek f24ccf
-- 
Michal Suchanek f24ccf
2.26.2
Michal Suchanek f24ccf