aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/smp.c
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2020-09-18 17:19:46 +0100
committerMarc Zyngier <maz@kernel.org>2020-09-18 17:40:48 +0100
commitac15a54e03d13686d2fc016a88311801b0734046 (patch)
treec70e6e93225f2f219114176111769d1090be2eb8 /arch/arm/kernel/smp.c
parentarm64: Fix -Wunused-function warning when !CONFIG_HOTPLUG_CPU (diff)
downloadlinux-dev-ac15a54e03d13686d2fc016a88311801b0734046.tar.xz
linux-dev-ac15a54e03d13686d2fc016a88311801b0734046.zip
arm: Move ipi_teardown() to a CONFIG_HOTPLUG_CPU section
ipi_teardown() is only used when CONFIG_HOTPLUG_CPU is enabled. Move the function to a location guarded by this config option. Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm/kernel/smp.c')
-rw-r--r--arch/arm/kernel/smp.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 00327fa74b01..8425da517984 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -85,7 +85,6 @@ static int nr_ipi __read_mostly = NR_IPI;
static struct irq_desc *ipi_desc[MAX_IPI] __read_mostly;
static void ipi_setup(int cpu);
-static void ipi_teardown(int cpu);
static DECLARE_COMPLETION(cpu_running);
@@ -236,6 +235,17 @@ int platform_can_hotplug_cpu(unsigned int cpu)
return cpu != 0;
}
+static void ipi_teardown(int cpu)
+{
+ int i;
+
+ if (WARN_ON_ONCE(!ipi_irq_base))
+ return;
+
+ for (i = 0; i < nr_ipi; i++)
+ disable_percpu_irq(ipi_irq_base + i);
+}
+
/*
* __cpu_disable runs on the processor to be shutdown.
*/
@@ -707,17 +717,6 @@ static void ipi_setup(int cpu)
enable_percpu_irq(ipi_irq_base + i, 0);
}
-static void ipi_teardown(int cpu)
-{
- int i;
-
- if (WARN_ON_ONCE(!ipi_irq_base))
- return;
-
- for (i = 0; i < nr_ipi; i++)
- disable_percpu_irq(ipi_irq_base + i);
-}
-
void __init set_smp_ipi_range(int ipi_base, int n)
{
int i;