aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-03-24 06:19:33 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-03-31 12:17:13 -0400
commitb966087b5145e044b033ea6bb6c16a3b5dc4c48e (patch)
treeebab0a22e082333d1bb3815cfa051c64ef251611 /arch/mips
parent45b29578040e42c88d27ab46510fa822ce14767e (diff)
MIPS: Fix warning when including smp-ops.h with CONFIG_SMP=n
The gic_send_ipi_mask function declared in smp-ops.h takes a struct cpumask argument, but linux/cpumask.h is only included within an #ifdef CONFIG_SMP. Move the gic_ function declarations within that #ifdef too to fix warnings during build such as: In file included from arch/mips/fw/arc/init.c:15:0: /mnt/buildbot/kernel/mips/slave/mips-linux__allno_/build/arch/mips/include/asm/smp-ops.h:62:44: warning: 'struct cpumask' declared inside parameter list [enabled by default] extern void gic_send_ipi_mask(const struct cpumask *mask, unsigned int action); Reported-by: Markos Chandras <markos.chandras@imgtec.com> Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6655/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/smp-ops.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/smp-ops.h b/arch/mips/include/asm/smp-ops.h
index a042d24534bd..73d35b18fb64 100644
--- a/arch/mips/include/asm/smp-ops.h
+++ b/arch/mips/include/asm/smp-ops.h
@@ -45,6 +45,9 @@ static inline void plat_smp_setup(void)
45 mp_ops->smp_setup(); 45 mp_ops->smp_setup();
46} 46}
47 47
48extern void gic_send_ipi_single(int cpu, unsigned int action);
49extern void gic_send_ipi_mask(const struct cpumask *mask, unsigned int action);
50
48#else /* !CONFIG_SMP */ 51#else /* !CONFIG_SMP */
49 52
50struct plat_smp_ops; 53struct plat_smp_ops;
@@ -60,9 +63,6 @@ static inline void register_smp_ops(struct plat_smp_ops *ops)
60 63
61#endif /* !CONFIG_SMP */ 64#endif /* !CONFIG_SMP */
62 65
63extern void gic_send_ipi_single(int cpu, unsigned int action);
64extern void gic_send_ipi_mask(const struct cpumask *mask, unsigned int action);
65
66static inline int register_up_smp_ops(void) 66static inline int register_up_smp_ops(void)
67{ 67{
68#ifdef CONFIG_SMP_UP 68#ifdef CONFIG_SMP_UP