[PATCH 1/2] MIPS: SMP: Group CONFIG_GENERIC_IRQ_IPI together

From: Matt Redfearn
Date: Tue Feb 20 2018 - 05:33:30 EST


In preparation for allowing selection of a single IPI / CPU, group
affected code together to minimise ifdeffery.

Signed-off-by: Matt Redfearn <matt.redfearn@xxxxxxxx>
---

arch/mips/kernel/smp.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index d84b9066b465..5b25e181cefe 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -84,11 +84,6 @@ static cpumask_t cpu_core_setup_map;

cpumask_t cpu_coherent_mask;

-#ifdef CONFIG_GENERIC_IRQ_IPI
-static struct irq_desc *call_desc;
-static struct irq_desc *sched_desc;
-#endif
-
static inline void set_cpu_sibling_map(int cpu)
{
int i;
@@ -157,6 +152,10 @@ void register_smp_ops(const struct plat_smp_ops *ops)
}

#ifdef CONFIG_GENERIC_IRQ_IPI
+static unsigned int call_virq, sched_virq;
+static struct irq_desc *call_desc;
+static struct irq_desc *sched_desc;
+
void mips_smp_send_ipi_single(int cpu, unsigned int action)
{
mips_smp_send_ipi_mask(cpumask_of(cpu), action);
@@ -240,8 +239,6 @@ static void smp_ipi_init_one(unsigned int virq,
BUG_ON(ret);
}

-static unsigned int call_virq, sched_virq;
-
int mips_smp_ipi_allocate(const struct cpumask *mask)
{
int virq;
--
2.7.4