|
Michal Suchanek |
cfbb9a |
From 042ef7cc43f4571d8cbe44a7c735ab6622809142 Mon Sep 17 00:00:00 2001
|
|
Michal Suchanek |
cfbb9a |
From: Nathan Lynch <nathanl@linux.ibm.com>
|
|
Michal Suchanek |
cfbb9a |
Date: Fri, 12 Jun 2020 00:12:33 -0500
|
|
Michal Suchanek |
cfbb9a |
Subject: [PATCH] powerpc/numa: remove prrn_is_enabled()
|
|
Michal Suchanek |
cfbb9a |
|
|
Michal Suchanek |
cfbb9a |
References: bsc#1181674 ltc#189159
|
|
Michal Suchanek |
cfbb9a |
Patch-mainline: v5.9-rc1
|
|
Michal Suchanek |
cfbb9a |
Git-commit: 042ef7cc43f4571d8cbe44a7c735ab6622809142
|
|
Michal Suchanek |
cfbb9a |
|
|
Michal Suchanek |
cfbb9a |
All users of this prrn_is_enabled() are gone; remove it.
|
|
Michal Suchanek |
cfbb9a |
|
|
Michal Suchanek |
cfbb9a |
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
|
|
Michal Suchanek |
cfbb9a |
Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
|
|
Michal Suchanek |
cfbb9a |
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
|
|
Michal Suchanek |
cfbb9a |
Link: https://lore.kernel.org/r/20200612051238.1007764-14-nathanl@linux.ibm.com
|
|
Michal Suchanek |
cfbb9a |
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
cfbb9a |
---
|
|
Michal Suchanek |
cfbb9a |
arch/powerpc/include/asm/topology.h | 5 -----
|
|
Michal Suchanek |
cfbb9a |
arch/powerpc/mm/numa.c | 5 -----
|
|
Michal Suchanek |
cfbb9a |
2 files changed, 10 deletions(-)
|
|
Michal Suchanek |
cfbb9a |
|
|
Michal Suchanek |
cfbb9a |
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
|
|
Michal Suchanek |
cfbb9a |
index 537c638582eb..658aad65912b 100644
|
|
Michal Suchanek |
cfbb9a |
--- a/arch/powerpc/include/asm/topology.h
|
|
Michal Suchanek |
cfbb9a |
+++ b/arch/powerpc/include/asm/topology.h
|
|
Michal Suchanek |
cfbb9a |
@@ -93,13 +93,8 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc)
|
|
Michal Suchanek |
cfbb9a |
#endif /* CONFIG_NUMA */
|
|
Michal Suchanek |
cfbb9a |
|
|
Michal Suchanek |
cfbb9a |
#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)
|
|
Michal Suchanek |
cfbb9a |
-extern int prrn_is_enabled(void);
|
|
Michal Suchanek |
cfbb9a |
extern int find_and_online_cpu_nid(int cpu);
|
|
Michal Suchanek |
cfbb9a |
#else
|
|
Michal Suchanek |
cfbb9a |
-static inline int prrn_is_enabled(void)
|
|
Michal Suchanek |
cfbb9a |
-{
|
|
Michal Suchanek |
cfbb9a |
- return 0;
|
|
Michal Suchanek |
cfbb9a |
-}
|
|
Michal Suchanek |
cfbb9a |
static inline int find_and_online_cpu_nid(int cpu)
|
|
Michal Suchanek |
cfbb9a |
{
|
|
Michal Suchanek |
cfbb9a |
return 0;
|
|
Michal Suchanek |
cfbb9a |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
|
|
Michal Suchanek |
cfbb9a |
index dec7ce3b5e67..26fcc947dd2d 100644
|
|
Michal Suchanek |
cfbb9a |
--- a/arch/powerpc/mm/numa.c
|
|
Michal Suchanek |
cfbb9a |
+++ b/arch/powerpc/mm/numa.c
|
|
Michal Suchanek |
cfbb9a |
@@ -1210,11 +1210,6 @@ int arch_update_cpu_topology(void)
|
|
Michal Suchanek |
cfbb9a |
return numa_update_cpu_topology(true);
|
|
Michal Suchanek |
cfbb9a |
}
|
|
Michal Suchanek |
cfbb9a |
|
|
Michal Suchanek |
cfbb9a |
-int prrn_is_enabled(void)
|
|
Michal Suchanek |
cfbb9a |
-{
|
|
Michal Suchanek |
cfbb9a |
- return 0;
|
|
Michal Suchanek |
cfbb9a |
-}
|
|
Michal Suchanek |
cfbb9a |
-
|
|
Michal Suchanek |
cfbb9a |
static int topology_update_init(void)
|
|
Michal Suchanek |
cfbb9a |
{
|
|
Michal Suchanek |
cfbb9a |
topology_inited = 1;
|
|
Michal Suchanek |
cfbb9a |
--
|
|
Michal Suchanek |
cfbb9a |
2.26.2
|
|
Michal Suchanek |
cfbb9a |
|