From 6325cb4a4ea8f4af8515b923650dd8f709694b44 Mon Sep 17 00:00:00 2001

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

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

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

References: bsc#1181674 ltc#189159

Patch-mainline: v5.9-rc1

Git-commit: 6325cb4a4ea8f4af8515b923650dd8f709694b44

Since vphn_enabled is always 0, we can remove the call to

topology_schedule_update() and remove the code which becomes

unreachable as a result.

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

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

---

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

 1 file changed, 14 deletions(-)

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c

index 6207297490a8..8415481a7f13 100644

--- a/arch/powerpc/mm/numa.c

+++ b/arch/powerpc/mm/numa.c

@@ -1414,17 +1414,6 @@ int arch_update_cpu_topology(void)

 	return numa_update_cpu_topology(true);

 }

-static void topology_work_fn(struct work_struct *work)

-{

-	rebuild_sched_domains();

-}

-static DECLARE_WORK(topology_work, topology_work_fn);

-

-static void topology_schedule_update(void)

-{

-	schedule_work(&topology_work);

-}

-

 /*

  * Start polling for associativity changes.

  */

@@ -1450,9 +1439,6 @@ static int topology_update_init(void)

 {

 	start_topology_update();

-	if (vphn_enabled)

-		topology_schedule_update();

-

 	topology_inited = 1;

 	return 0;

 }

-- 

2.26.2