Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dd92891 authored by Rusty Russell's avatar Rusty Russell
Browse files

mips: fix up obsolete cpu function usage. 



Thanks to spatch, plus manual removal of "&*".  Then a sweep for
for_each_cpu_mask => for_each_cpu.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-mips@linux-mips.org
parent d089f8e9

arch/mips/bcm63xx/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ static inline int enable_irq_for_cpu(int cpu, struct irq_data *d, 


#ifdef CONFIG_SMP

	if (m)

		enable &= cpu_isset(cpu, *m);

		enable &= cpumask_test_cpu(cpu, m);

	else if (irqd_affinity_was_set(d))

		enable &= cpu_isset(cpu, *d->affinity);

		enable &= cpumask_test_cpu(cpu, d->affinity);

#endif

	return enable;

}

arch/mips/cavium-octeon/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static inline void octeon_send_ipi_mask(const struct cpumask *mask, 
{

	unsigned int i;



	for_each_cpu_mask(i, *mask)

	for_each_cpu(i, mask)

		octeon_send_ipi_single(i, action);

}
@@ -239,7 +239,7 @@ static int octeon_cpu_disable(void) 
		return -ENOTSUPP;



	set_cpu_online(cpu, false);

	cpu_clear(cpu, cpu_callin_map);

	cpumask_clear_cpu(cpu, &cpu_callin_map);

	octeon_fixup_irqs();



	flush_cache_all();

arch/mips/kernel/crash.c

+4 −4
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ static void crash_shutdown_secondary(void *ignore) 
		return;



	local_irq_disable();

	if (!cpu_isset(cpu, cpus_in_crash))

	if (!cpumask_test_cpu(cpu, &cpus_in_crash))

		crash_save_cpu(regs, cpu);

	cpu_set(cpu, cpus_in_crash);

	cpumask_set_cpu(cpu, &cpus_in_crash);



	while (!atomic_read(&kexec_ready_to_reboot))

		cpu_relax();
@@ -50,7 +50,7 @@ static void crash_kexec_prepare_cpus(void) 
	 */

	pr_emerg("Sending IPI to other cpus...\n");

	msecs = 10000;

	while ((cpus_weight(cpus_in_crash) < ncpus) && (--msecs > 0)) {

	while ((cpumask_weight(&cpus_in_crash) < ncpus) && (--msecs > 0)) {

		cpu_relax();

		mdelay(1);

	}
@@ -66,5 +66,5 @@ void default_machine_crash_shutdown(struct pt_regs *regs) 
	crashing_cpu = smp_processor_id();

	crash_save_cpu(regs, crashing_cpu);

	crash_kexec_prepare_cpus();

	cpu_set(crashing_cpu, cpus_in_crash);

	cpumask_set_cpu(crashing_cpu, &cpus_in_crash);

}

arch/mips/kernel/mips-mt-fpaff.c

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, 
	/* Compute new global allowed CPU set if necessary */

	ti = task_thread_info(p);

	if (test_ti_thread_flag(ti, TIF_FPUBOUND) &&

	    cpus_intersects(*new_mask, mt_fpu_cpumask)) {

		cpus_and(*effective_mask, *new_mask, mt_fpu_cpumask);

	    cpumask_intersects(new_mask, &mt_fpu_cpumask)) {

		cpumask_and(effective_mask, new_mask, &mt_fpu_cpumask);

		retval = set_cpus_allowed_ptr(p, effective_mask);

	} else {

		cpumask_copy(effective_mask, new_mask);

arch/mips/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
void arch_cpu_idle_dead(void)

{

	/* What the heck is this check doing ? */

	if (!cpu_isset(smp_processor_id(), cpu_callin_map))

	if (!cpumask_test_cpu(smp_processor_id(), &cpu_callin_map))

		play_dead();

}

#endif