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

Commit 47b4150b authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files

parisc: fix irq compile bugs in arch/parisc/kernel/irq.c 



Fix miscompilation in arch/parisc/kernel/irq.c:
123: warning: passing arg 1 of `cpumask_setall' from incompatible pointer type
141: warning: passing arg 1 of `cpumask_copy' from incompatible pointer type
300: warning: passing arg 1 of `cpumask_copy' from incompatible pointer type
357: warning: passing arg 2 of `cpumask_copy' from incompatible pointer type

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent fed99b1e

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, const struct cpumask *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;

	}
@@ -138,7 +138,7 @@ static int cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest) 
	if (cpu_dest < 0)

		return -1;



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

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



	return 0;

}
@@ -299,7 +299,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;
@@ -356,7 +356,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);