From 9fb8b5fd1bf782a8257506ad5198237f4124d556 Mon Sep 17 00:00:00 2001

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

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

Subject: [PATCH] powerpc/numa: remove vphn_enabled and prrn_enabled internal

 flags

References: bsc#1181674 ltc#189159

Patch-mainline: v5.9-rc1

Git-commit: 9fb8b5fd1bf782a8257506ad5198237f4124d556

These flags are always zero now; remove them and suitably adjust the

remaining references to them.

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

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

---

 arch/powerpc/mm/numa.c | 6 ++----

 1 file changed, 2 insertions(+), 4 deletions(-)

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

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

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

@@ -1130,8 +1130,6 @@ struct topology_update_data {

 };

 static cpumask_t cpu_associativity_changes_mask;

-static const int vphn_enabled;

-static const int prrn_enabled;

 static int topology_inited;

 static long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity)

@@ -1292,7 +1290,7 @@ int numa_update_cpu_topology(bool cpus_locked)

 	struct device *dev;

 	int weight, new_nid, i = 0;

-	if (!prrn_enabled && !vphn_enabled && topology_inited)

+	if (topology_inited)

 		return 0;

 	weight = cpumask_weight(&cpu_associativity_changes_mask);

@@ -1432,7 +1430,7 @@ int stop_topology_update(void)

 int prrn_is_enabled(void)

 {

-	return prrn_enabled;

+	return 0;

 }

 static int topology_update_init(void)

-- 

2.26.2