diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 17:48:47 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 14:48:08 +0200 |
| commit | 337ce6811bfe474cc449de1f95d2c4f26641f5af (patch) | |
| tree | 361688a99d558f589e5edaa3358fbc40ff0b56e9 | |
| parent | 1d5f821c3f9f2344e1a854aa91a5ab3b25ee5c2a (diff) | |
| download | linux-stable-337ce6811bfe474cc449de1f95d2c4f26641f5af.tar.gz linux-stable-337ce6811bfe474cc449de1f95d2c4f26641f5af.tar.bz2 linux-stable-337ce6811bfe474cc449de1f95d2c4f26641f5af.zip | |
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
| -rw-r--r-- | arch/parisc/kernel/irq.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index cb450e1e79b3..34bc2afa6a69 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -113,13 +113,8 @@ int cpu_check_affinity(struct irq_data *d, const struct cpumask *dest) int cpu_dest; /* timer and ipi have to always be received on all CPUs */ - if (CHECK_IRQ_PER_CPU(irq_to_desc(d->irq)->status)) { - /* Bad linux design decision. The mask has already - * been set; we must reset it. Will fix - tglx - */ - cpumask_setall(d->affinity); + if (irqd_is_per_cpu(d)) return -EINVAL; - } /* whatever mask they set, we just allow one CPU */ cpu_dest = first_cpu(*dest); @@ -357,7 +352,7 @@ void do_cpu_irq_mask(struct pt_regs *regs) #ifdef CONFIG_SMP desc = irq_to_desc(irq); 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)) { int cpu = first_cpu(dest); |