openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/numa: remove start/stop_topology_update() 

These APIs have become no-ops, so remove them 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-12-nathanl@linux.ibm.com
This commit is contained in:
Nathan Lynch 2020-06-12 00:12:31 -05:00 committed by Michael Ellerman
parent b1815aeac7
commit 1835303e56
4 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/topology.h
View File

@ -93,19 +93,9 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc)
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR) #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 prrn_is_enabled(void);
extern int find_and_online_cpu_nid(int cpu); extern int find_and_online_cpu_nid(int cpu);
#else #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) static inline int prrn_is_enabled(void)
{ {
return 0; return 0;

20
arch/powerpc/mm/numa.c
View File

@ -1157,8 +1157,6 @@ static long vphn_get_associativity(unsigned long cpu,
, rc); , rc);
break; break;
} }
stop_topology_update();
out: out:
return rc; return rc;
} }
@ -1212,22 +1210,6 @@ int arch_update_cpu_topology(void)
return numa_update_cpu_topology(true); 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) int prrn_is_enabled(void)
{ {
return 0; return 0;
@ -1235,8 +1217,6 @@ int prrn_is_enabled(void)
static int topology_update_init(void) static int topology_update_init(void)
{ {
start_topology_update();
topology_inited = 1; topology_inited = 1;
return 0; return 0;
} }

4
arch/powerpc/platforms/pseries/mobility.c
View File

@ -388,8 +388,6 @@ static ssize_t migration_store(struct class *class,
if (rc) if (rc)
return rc; return rc;
stop_topology_update();
do { do {
rc = rtas_ibm_suspend_me(streamid); rc = rtas_ibm_suspend_me(streamid);
if (rc == -EAGAIN) if (rc == -EAGAIN)
@ -401,8 +399,6 @@ static ssize_t migration_store(struct class *class,
post_mobility_fixup(); post_mobility_fixup();
start_topology_update();
return count; return count;
} }

5
arch/powerpc/platforms/pseries/suspend.c
View File

@ -145,11 +145,8 @@ static ssize_t store_hibernate(struct device *dev,
ssleep(1); ssleep(1);
} while (rc == -EAGAIN); } while (rc == -EAGAIN);
if (!rc) { if (!rc)
stop_topology_update();
rc = pm_suspend(PM_SUSPEND_MEM); rc = pm_suspend(PM_SUSPEND_MEM);
start_topology_update();
}
stream_id = 0; stream_id = 0;