Commit 1835303e authored by Nathan Lynch's avatar Nathan Lynch Committed by Michael Ellerman
Browse files

powerpc/numa: remove start/stop_topology_update() 



These APIs have become no-ops, so remove them and all call sites.

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

arch/powerpc/include/asm/topology.h

+0 −10
Original line number Diff line number Diff line
@@ -93,19 +93,9 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc) 
#endif /* CONFIG_NUMA */



#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)

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);

#else

static inline int start_topology_update(void)

{

	return 0;

}

static inline int stop_topology_update(void)

{

	return 0;

}

static inline int prrn_is_enabled(void)

{

	return 0;

arch/powerpc/mm/numa.c

+0 −20
Original line number Diff line number Diff line
@@ -1157,8 +1157,6 @@ static long vphn_get_associativity(unsigned long cpu, 
			, rc);

		break;

	}



	stop_topology_update();

out:

	return rc;

}
@@ -1212,22 +1210,6 @@ int arch_update_cpu_topology(void) 
	return numa_update_cpu_topology(true);

}



/*

 * Start polling for associativity changes.

 */

int start_topology_update(void)

{

	return 0;

}



/*

 * Disable polling for VPHN associativity changes.

 */

int stop_topology_update(void)

{

	return 0;

}



int prrn_is_enabled(void)

{

	return 0;
@@ -1235,8 +1217,6 @@ int prrn_is_enabled(void) 


static int topology_update_init(void)

{

	start_topology_update();



	topology_inited = 1;

	return 0;

}

arch/powerpc/platforms/pseries/mobility.c

+0 −4
Original line number Diff line number Diff line
@@ -388,8 +388,6 @@ static ssize_t migration_store(struct class *class, 
	if (rc)

		return rc;



	stop_topology_update();



	do {

		rc = rtas_ibm_suspend_me(streamid);

		if (rc == -EAGAIN)
@@ -401,8 +399,6 @@ static ssize_t migration_store(struct class *class, 


	post_mobility_fixup();



	start_topology_update();



	return count;

}

arch/powerpc/platforms/pseries/suspend.c

+1 −4
Original line number Diff line number Diff line
@@ -145,11 +145,8 @@ static ssize_t store_hibernate(struct device *dev, 
			ssleep(1);

	} while (rc == -EAGAIN);



	if (!rc) {

		stop_topology_update();

	if (!rc)

		rc = pm_suspend(PM_SUSPEND_MEM);

		start_topology_update();

	}



	stream_id = 0;