summaryrefslogtreecommitdiffstats
path: root/kernel/irq/migration.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-09-27 12:45:41 +0000
committerThomas Gleixner <tglx@linutronix.de>2010-10-04 12:43:46 +0200
commitc96b3b3c448592a0b87ef20306deb8b1fb4878c7 (patch)
tree744c6879a585b9ab07ed51315930f8a673c09aed /kernel/irq/migration.c
parent37e12df709f09eac17314d79a52190ac46746e33 (diff)
downloadlinux-c96b3b3c448592a0b87ef20306deb8b1fb4878c7.tar.bz2
genirq: Provide compat handling for chip->set_affinity()
Wrap the old chip function set_affinity() until the migration is complete and the old chip functions are removed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <20100927121842.732894108@linutronix.de> Reviewed-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/migration.c')
-rw-r--r--kernel/irq/migration.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 7888e5d5575a..1d2541940480 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -7,6 +7,7 @@
void move_masked_irq(int irq)
{
struct irq_desc *desc = irq_to_desc(irq);
+ struct irq_chip *chip = desc->irq_data.chip;
if (likely(!(desc->status & IRQ_MOVE_PENDING)))
return;
@@ -24,7 +25,7 @@ void move_masked_irq(int irq)
if (unlikely(cpumask_empty(desc->pending_mask)))
return;
- if (!desc->irq_data.chip->set_affinity)
+ if (!chip->irq_set_affinity)
return;
assert_raw_spin_locked(&desc->lock);
@@ -43,7 +44,8 @@ void move_masked_irq(int irq)
*/
if (likely(cpumask_any_and(desc->pending_mask, cpu_online_mask)
< nr_cpu_ids))
- if (!desc->irq_data.chip->set_affinity(irq, desc->pending_mask)) {
+ if (!chip->irq_set_affinity(&desc->irq_data,
+ desc->pending_mask, false)) {
cpumask_copy(desc->irq_data.affinity, desc->pending_mask);
irq_set_thread_affinity(desc);
}