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

diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index 379e2cc3789fdf10719fa4e221a1cbfeee77ae84..537c638582ebf7a97032538ba5d6ba81b26928e9 100644 (file)
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -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;

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 6c579ac3e679628a69cca4d21653fb042351b5ae..dec7ce3b5e67330d3533443df8286c6ca3b18334 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -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;
 }

diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index 10d98299773636e47f07d9dd01d6a00409bcfa52..c0b09f6f0ae3a37557bf95fa46d769e0799151b1 100644 (file)
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -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;
 }
 

diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index f789693f61f4047c6b92f85c372ef82e5ff1df20..81e0ac58d62047a18fdf4ec60f1af0cb5347eb66 100644 (file)
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -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;