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

Commit 0de26520 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: make irq_set_affinity() take a const struct cpumask 



Impact: change existing irq_chip API

Not much point with gentle transition here: the struct irq_chip's
setaffinity method signature needs to change.

Fortunately, not widely used code, but hits a few architectures.

Note: In irq_select_affinity() I save a temporary in by mangling
irq_desc[irq].affinity directly.  Ingo, does this break anything?

(Folded in fix from KOSAKI Motohiro)

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarGrant Grundler <grundler@parisc-linux.org>
Acked-by: default avatarIngo Molnar <mingo@redhat.com>
Cc: ralf@linux-mips.org
Cc: grundler@parisc-linux.org
Cc: jeremy@xensource.com
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
parent 29c0177e

arch/alpha/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int irq_select_affinity(unsigned int irq) 
	last_cpu = cpu;



	irq_desc[irq].affinity = cpumask_of_cpu(cpu);

	irq_desc[irq].chip->set_affinity(irq, cpumask_of_cpu(cpu));

	irq_desc[irq].chip->set_affinity(irq, cpumask_of(cpu));

	return 0;

}

#endif /* CONFIG_SMP */

arch/alpha/kernel/sys_dp264.c

+4 −4
Original line number Diff line number Diff line
@@ -177,19 +177,19 @@ cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) 
}



static void

dp264_set_affinity(unsigned int irq, cpumask_t affinity)

dp264_set_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&dp264_irq_lock);

	cpu_set_irq_affinity(irq, affinity);

	cpu_set_irq_affinity(irq, *affinity);

	tsunami_update_irq_hw(cached_irq_mask);

	spin_unlock(&dp264_irq_lock);

}



static void

clipper_set_affinity(unsigned int irq, cpumask_t affinity)

clipper_set_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&dp264_irq_lock);

	cpu_set_irq_affinity(irq - 16, affinity);

	cpu_set_irq_affinity(irq - 16, *affinity);

	tsunami_update_irq_hw(cached_irq_mask);

	spin_unlock(&dp264_irq_lock);

}

arch/alpha/kernel/sys_titan.c

+2 −2
Original line number Diff line number Diff line
@@ -158,10 +158,10 @@ titan_cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) 
}



static void

titan_set_irq_affinity(unsigned int irq, cpumask_t affinity)

titan_set_irq_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&titan_irq_lock);

	titan_cpu_set_irq_affinity(irq - 16, affinity);

	titan_cpu_set_irq_affinity(irq - 16, *affinity);

	titan_update_irq_hw(titan_cached_irq_mask);

	spin_unlock(&titan_irq_lock);

}

arch/arm/common/gic.c

+2 −2
Original line number Diff line number Diff line
@@ -109,11 +109,11 @@ static void gic_unmask_irq(unsigned int irq) 
}



#ifdef CONFIG_SMP

static void gic_set_cpu(unsigned int irq, cpumask_t mask_val)

static void gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)

{

	void __iomem *reg = gic_dist_base(irq) + GIC_DIST_TARGET + (gic_irq(irq) & ~3);

	unsigned int shift = (irq % 4) * 8;

	unsigned int cpu = first_cpu(mask_val);

	unsigned int cpu = cpumask_first(mask_val);

	u32 val;



	spin_lock(&irq_controller_lock);

arch/arm/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu) 
	pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu);



	spin_lock_irq(&desc->lock);

	desc->chip->set_affinity(irq, cpumask_of_cpu(cpu));

	desc->chip->set_affinity(irq, cpumask_of(cpu));

	spin_unlock_irq(&desc->lock);

}