parisc: Convert the final irq bits
1) As promised in the comment, the core does not copy cpumask anymore when the arch code returns -EINVAL 2) Get the per cpu information from irq_data Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: linux-parisc@vger.kernel.org
This commit is contained in:
parent
1d5f821c3f
commit
337ce6811b
|
@ -113,13 +113,8 @@ int cpu_check_affinity(struct irq_data *d, const struct cpumask *dest)
|
||||||
int cpu_dest;
|
int cpu_dest;
|
||||||
|
|
||||||
/* timer and ipi have to always be received on all CPUs */
|
/* timer and ipi have to always be received on all CPUs */
|
||||||
if (CHECK_IRQ_PER_CPU(irq_to_desc(d->irq)->status)) {
|
if (irqd_is_per_cpu(d))
|
||||||
/* Bad linux design decision. The mask has already
|
|
||||||
* been set; we must reset it. Will fix - tglx
|
|
||||||
*/
|
|
||||||
cpumask_setall(d->affinity);
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
|
||||||
|
|
||||||
/* whatever mask they set, we just allow one CPU */
|
/* whatever mask they set, we just allow one CPU */
|
||||||
cpu_dest = first_cpu(*dest);
|
cpu_dest = first_cpu(*dest);
|
||||||
|
@ -357,7 +352,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
desc = irq_to_desc(irq);
|
desc = irq_to_desc(irq);
|
||||||
cpumask_copy(&dest, desc->irq_data.affinity);
|
cpumask_copy(&dest, desc->irq_data.affinity);
|
||||||
if (CHECK_IRQ_PER_CPU(desc->status) &&
|
if (irqd_is_per_cpu(&desc->irq_data) &&
|
||||||
!cpu_isset(smp_processor_id(), dest)) {
|
!cpu_isset(smp_processor_id(), dest)) {
|
||||||
int cpu = first_cpu(dest);
|
int cpu = first_cpu(dest);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue