From cdf082c4570f186d608aca688f2cc872b014558a Mon Sep 17 00:00:00 2001

From: Nathan Lynch <nathanl@linux.ibm.com>

Date: Fri, 12 Jun 2020 00:12:34 -0500

Subject: [PATCH] powerpc/numa: remove arch_update_cpu_topology

References: bsc#1181674 ltc#189159

Patch-mainline: v5.9-rc1

Git-commit: cdf082c4570f186d608aca688f2cc872b014558a

Since arch_update_cpu_topology() doesn't do anything on powerpc now,

remove it and associated dead code.

Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>

Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Link: https://lore.kernel.org/r/20200612051238.1007764-15-nathanl@linux.ibm.com

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/powerpc/include/asm/topology.h |  6 ------

 arch/powerpc/mm/numa.c              | 10 ----------

 2 files changed, 16 deletions(-)

diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h

--- a/arch/powerpc/include/asm/topology.h

+++ b/arch/powerpc/include/asm/topology.h

@@ -43,7 +43,6 @@ extern void __init dump_numa_cpu_topology(void);

 extern int sysfs_add_device_to_node(struct device *dev, int nid);

 extern void sysfs_remove_device_from_node(struct device *dev, int nid);

-extern int numa_update_cpu_topology(bool cpus_locked);

 static inline void update_numa_cpu_lookup_table(unsigned int cpu, int node)

 {

@@ -78,11 +77,6 @@ static inline void sysfs_remove_device_from_node(struct device *dev,

 {

 }

-static inline int numa_update_cpu_topology(bool cpus_locked)

-{

-	return 0;

-}

-

 static inline void update_numa_cpu_lookup_table(unsigned int cpu, int node) {}

 #endif /* CONFIG_NUMA */

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c

index 26fcc947dd2d..e437a9ac4956 100644

--- a/arch/powerpc/mm/numa.c

+++ b/arch/powerpc/mm/numa.c

@@ -1200,16 +1200,6 @@ int find_and_online_cpu_nid(int cpu)

 	return new_nid;

 }

-int numa_update_cpu_topology(bool cpus_locked)

-{

-	return 0;

-}

-

-int arch_update_cpu_topology(void)

-{

-	return numa_update_cpu_topology(true);

-}

-

 static int topology_update_init(void)

 {

 	topology_inited = 1;

-- 

2.26.2