Commit 50e0cf37 authored by Nathan Lynch's avatar Nathan Lynch Committed by Michael Ellerman
Browse files

powerpc/numa: remove unreachable topology timer code 



Since vphn_enabled is always 0, we can stub out
timed_topology_update() and remove the code which becomes unreachable.

Signed-off-by: default avatarNathan Lynch <nathanl@linux.ibm.com>
Reviewed-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200612051238.1007764-7-nathanl@linux.ibm.com
parent e6eacf8e

arch/powerpc/mm/numa.c

+0 −21
Original line number Diff line number Diff line
@@ -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;



/*
@@ -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,14 +1425,6 @@ static void topology_schedule_update(void) 
	schedule_work(&topology_work);

}



static struct timer_list topology_timer;



static void reset_topology_timer(void)

{

	if (vphn_enabled)

		mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ);

}



/*

 * Start polling for associativity changes.

 */