From b1815aeac7fde2dc3412daf2efaededd21cd58e0 Mon Sep 17 00:00:00 2001

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

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

Subject: [PATCH] powerpc/numa: remove timed_topology_update()

References: bsc#1181674 ltc#189159

Patch-mainline: v5.9-rc1

Git-commit: b1815aeac7fde2dc3412daf2efaededd21cd58e0

timed_topology_update is a no-op now, so remove it and all call sites.

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-11-nathanl@linux.ibm.com

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

---

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

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

 arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 --

 3 files changed, 16 deletions(-)

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

index 2db7ba789720..379e2cc3789f 100644

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

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

@@ -97,7 +97,6 @@ extern int start_topology_update(void);

 extern int stop_topology_update(void);

 extern int prrn_is_enabled(void);

 extern int find_and_online_cpu_nid(int cpu);

-extern int timed_topology_update(int nsecs);

 #else

 static inline int start_topology_update(void)

 {

@@ -115,10 +114,6 @@ static inline int find_and_online_cpu_nid(int cpu)

 {

 	return 0;

 }

-static inline int timed_topology_update(int nsecs)

-{

-	return 0;

-}

 #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */

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

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

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

@@ -1124,14 +1124,6 @@ u64 memory_hotplug_max(void)

 	return rc;

 }

-/*

- * Change polling interval for associativity changes.

- */

-int timed_topology_update(int nsecs)

-{

-	return 0;

-}

-

 /*

  * Retrieve the new associativity information for a virtual processor's

  * home node.

@@ -1147,7 +1139,6 @@ static long vphn_get_associativity(unsigned long cpu,

 		break;

 	case H_SUCCESS:

 		dbg("VPHN hcall succeeded. Reset polling...\n");

-		timed_topology_update(0);

 		break;

 	}

diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c

index d4b346355bb9..dbfabb185eb5 100644

--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c

+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c

@@ -263,7 +263,6 @@ static int dlpar_offline_cpu(struct device_node *dn)

 				break;

 			cpu_maps_update_done();

-			timed_topology_update(1);

 			rc = device_offline(get_cpu_device(cpu));

 			if (rc)

 				goto out;

@@ -302,7 +301,6 @@ static int dlpar_online_cpu(struct device_node *dn)

 			if (get_hard_smp_processor_id(cpu) != thread)

 				continue;

 			cpu_maps_update_done();

-			timed_topology_update(1);

 			find_and_online_cpu_nid(cpu);

 			rc = device_online(get_cpu_device(cpu));

 			if (rc) {

-- 

2.26.2