From 50e0cf3742a01e72f4ea4a8fe9221b152e22871b Mon Sep 17 00:00:00 2001

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

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

Subject: [PATCH] powerpc/numa: remove unreachable topology timer code

References: bsc#1181674 ltc#189159

Patch-mainline: v5.9-rc1

Git-commit: 50e0cf3742a01e72f4ea4a8fe9221b152e22871b

Since vphn_enabled is always 0, we can stub out

timed_topology_update() and remove the code which becomes unreachable.

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

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

---

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

 1 file changed, 21 deletions(-)

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

@@ -1129,13 +1129,9 @@ struct topology_update_data {

 	int new_nid;

 };

-#define TOPOLOGY_DEF_TIMER_SECS	60

-

 static cpumask_t cpu_associativity_changes_mask;

 static const int vphn_enabled;

 static const int prrn_enabled;

-static void reset_topology_timer(void);

-static int topology_timer_secs = 1;

 static int topology_inited;

 static long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity)

@@ -1143,15 +1139,6 @@ static int topology_inited;

  */

 int timed_topology_update(int nsecs)

 {

-	if (vphn_enabled) {

-		if (nsecs > 0)

-			topology_timer_secs = nsecs;

-		else

-			topology_timer_secs = TOPOLOGY_DEF_TIMER_SECS;

-

-		reset_topology_timer();

-	}

-

 	return 0;

 }

@@ -1438,16 +1425,6 @@ static void topology_schedule_update(void)

 	schedule_work(&topology_work);

 }

-static struct timer_list topology_timer =

-	TIMER_INITIALIZER(topology_timer_fn, 0, 0);

-

-static void reset_topology_timer(void)

-{

-	topology_timer.data = 0;

-	topology_timer.expires = jiffies + topology_timer_secs * HZ;

-	mod_timer(&topology_timer, topology_timer.expires);

-}

-

 /*

  * Start polling for associativity changes.

  */

-- 

2.26.2