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

Commit 7c4be70e authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

parisc: fix use of new cpumask api in irq.c 



cpumask api needs to take a pointer to irq_desc[cpu].affinity

Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 5a8247ca

arch/parisc/kernel/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int cpu_check_affinity(unsigned int irq, cpumask_t *dest) 
	if (CHECK_IRQ_PER_CPU(irq)) {

		/* Bad linux design decision.  The mask has already

		 * been set; we must reset it */

		cpumask_setall(irq_desc[irq].affinity);

		cpumask_setall(&irq_desc[irq].affinity);

		return -EINVAL;

	}
@@ -136,7 +136,7 @@ static void cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest) 
	if (cpu_check_affinity(irq, dest))

		return;



	cpumask_copy(irq_desc[irq].affinity, dest);

	cpumask_copy(&irq_desc[irq].affinity, dest);

}

#endif
@@ -295,7 +295,7 @@ int txn_alloc_irq(unsigned int bits_wide) 
unsigned long txn_affinity_addr(unsigned int irq, int cpu)

{

#ifdef CONFIG_SMP

	cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu));

	cpumask_copy(&irq_desc[irq].affinity, cpumask_of(cpu));

#endif



	return per_cpu(cpu_data, cpu).txn_addr;
@@ -352,7 +352,7 @@ void do_cpu_irq_mask(struct pt_regs *regs) 
	irq = eirr_to_irq(eirr_val);



#ifdef CONFIG_SMP

	cpumask_copy(&dest, irq_desc[irq].affinity);

	cpumask_copy(&dest, &irq_desc[irq].affinity);

	if (CHECK_IRQ_PER_CPU(irq_desc[irq].status) &&

	    !cpu_isset(smp_processor_id(), dest)) {

		int cpu = first_cpu(dest);