cpumask: arch_send_call_function_ipi_mask: mips
PATCH 3/7 cpumask: arch_send_call_function_ipi_mask: mips
We're weaning the core code off handing cpumask's around on-stack. This introduces arch_send_call_function_ipi_mask(), and by defining it, the old arch_send_call_function_ipi is defined by the core code.
We also take the chance to wean the implementations off the obsolescent for_each_cpu_mask(): making send_ipi_mask take the pointer seemed the most natural way to ensure all implementations used for_each_cpu.
Signed-off-by Rusty Russell <[email protected]>
--- arch/mips/include/asm/smp-ops.h | 2 +- arch/mips/include/asm/smp.h | 3 ++- arch/mips/kernel/smp-cmp.c | 4 ++-- arch/mips/kernel/smp-mt.c | 4 ++-- arch/mips/kernel/smp-up.c | 3 ++- arch/mips/kernel/smp.c | 2 +- arch/mips/mipssim/sim_smtc.c | 5 +++-- arch/mips/mti-malta/malta-smtc.c | 4 ++-- arch/mips/pmc-sierra/yosemite/smp.c | 4 ++-- arch/mips/sgi-ip27/ip27-smp.c | 4 ++-- arch/mips/sibyte/bcm1480/smp.c | 5 +++-- arch/mips/sibyte/sb1250/smp.c | 5 +++-- 12 files changed, 25 insertions(+), 20 deletions(-)
arch/mips/include/asm/smp-ops.h +1 -1
@@ -17,7 +17,7 @@struct plat_smp_ops {void (*send_ipi_single)(int cpu,unsigned int action); -void (*send_ipi_mask)(cpumask_t mask,unsigned int action); +void (*send_ipi_mask)(const struct cpumask *mask,unsigned int action);void (*init_secondary)(void );void (*smp_finish)(void );void (*cpus_done)(void );
arch/mips/include/asm/smp.h +2 -1
@@ -55,6 +55,7 @@ extern asmlinkage void smp_call_function extern asmlinkage void smp_call_function_interrupt(void);extern void arch_send_call_function_single_ipi (int cpu); -extern void arch_send_call_function_ipi (cpumask_t mask); +extern void arch_send_call_function_ipi_mask (const struct cpumask *mask); +#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask#endif /* __ASM_SMP_H */
arch/mips/kernel/smp-cmp.c +2 -2
@@ -135,11 +135,11 @@ void cmp_send_ipi_single(int cpu, unsignlocal_irq_restore (flags); } -static void cmp_send_ipi_mask (cpumask_t mask,unsigned int action) +static void cmp_send_ipi_mask (const struct cpumask *mask,unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)cmp_send_ipi_single (i, action); }
arch/mips/kernel/smp-mt.c +2 -2
@@ -141,11 +141,11 @@ static void vsmp_send_ipi_single(int cpulocal_irq_restore (flags); } -static void vsmp_send_ipi_mask (cpumask_t mask,unsigned int action) +static void vsmp_send_ipi_mask (const struct cpumask *mask,unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)vsmp_send_ipi_single (i, action); }
arch/mips/kernel/smp-up.c +2 -1
@@ -18,7 +18,8 @@ void up_send_ipi_single(int cpu, unsignepanic (KERN_ERR "%s called" , __func__); } -static inline void up_send_ipi_mask (cpumask_t mask,unsigned int action) +static inline void up_send_ipi_mask (const struct cpumask *mask, +unsigned int action) {panic (KERN_ERR "%s called" , __func__); }
arch/mips/kernel/smp.c +1 -1
@@ -128,7 +128,7 @@ asmlinkage __cpuinit void start_secondarcpu_idle (); } -void arch_send_call_function_ipi (cpumask_t mask) +void arch_send_call_function_ipi_mask (const struct cpumask *mask) { mp_ops->send_ipi_mask (mask,SMP_CALL_FUNCTION ); }
arch/mips/mipssim/sim_smtc.c +3 -2
@@ -43,11 +43,12 @@ static void ssmtc_send_ipi_single(int cp/* "CPU" may be TC of same VPE, VPE of same CPU, or different CPU */ } -static inline void ssmtc_send_ipi_mask (cpumask_t mask,unsigned int action) +static inline void ssmtc_send_ipi_mask (const struct cpumask *mask, +unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)ssmtc_send_ipi_single (i, action); }
arch/mips/mti-malta/malta-smtc.c +2 -2
@@ -21,11 +21,11 @@ static void msmtc_send_ipi_single(int cpsmtc_send_ipi (cpu,LINUX_SMP_IPI , action); } -static void msmtc_send_ipi_mask (cpumask_t mask,unsigned int action) +static void msmtc_send_ipi_mask (const struct cpumask *mask,unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)msmtc_send_ipi_single (i, action); }
arch/mips/pmc-sierra/yosemite/smp.c +2 -2
@@ -96,11 +96,11 @@ static void yos_send_ipi_single(int cpu, } } -static void yos_send_ipi_mask (cpumask_t mask,unsigned int action) +static void yos_send_ipi_mask (const struct cpumask *mask,unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)yos_send_ipi_single (i, action); }
arch/mips/sgi-ip27/ip27-smp.c +2 -2
@@ -165,11 +165,11 @@ static void ip27_send_ipi_single(int desREMOTE_HUB_SEND_INTR (COMPACT_TO_NASID_NODEID (cpu_to_node (destid)), irq); } -static void ip27_send_ipi_mask (cpumask_t mask,unsigned int action) +static void ip27_send_ipi (const struct cpumask *mask,unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)ip27_send_ipi_single (i, action); }
arch/mips/sibyte/bcm1480/smp.c +3 -2
@@ -82,11 +82,12 @@ static void bcm1480_send_ipi_single(int__raw_writeq ((((u64 )action)<<48 ), mailbox_0_set_regs[cpu]); } -static void bcm1480_send_ipi_mask (cpumask_t mask,unsigned int action) +static void bcm1480_send_ipi_mask (const struct cpumask *mask, +unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)bcm1480_send_ipi_single (i, action); }
arch/mips/sibyte/sb1250/smp.c +3 -2
@@ -70,11 +70,12 @@ static void sb1250_send_ipi_single(int c__raw_writeq ((((u64 )action) <<48 ), mailbox_set_regs[cpu]); } -static inline void sb1250_send_ipi_mask (cpumask_t mask,unsigned int action) +static inline void sb1250_send_ipi_mask (const struct cpumask *mask, +unsigned int action) {unsigned int i; -for_each_cpu_mask (i, mask) +for_each_cpu (i, mask)sb1250_send_ipi_single (i, action); }