From 48b8dc347fc680049a2efde7c52efc19070edc2a Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Fri, 30 Mar 2012 23:11:33 +0800 Subject: [PATCH] --- yaml --- r: 298201 b: refs/heads/master c: f5cb92ac82d06cb583c1f66666314c5c0a4d7913 h: refs/heads/master i: 298199: d24501276a53094431c71a6723e00051ef63f266 v: v3 --- [refs] | 2 +- trunk/kernel/irq/migration.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e1b6686785f2..3c4e0bd86712 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 241fc640be783f903e74b6d9c68481c01873f758 +refs/heads/master: f5cb92ac82d06cb583c1f66666314c5c0a4d7913 diff --git a/trunk/kernel/irq/migration.c b/trunk/kernel/irq/migration.c index 47420908fba0..c3c89751b327 100644 --- a/trunk/kernel/irq/migration.c +++ b/trunk/kernel/irq/migration.c @@ -43,12 +43,16 @@ void irq_move_masked_irq(struct irq_data *idata) * masking the irqs. */ if (likely(cpumask_any_and(desc->pending_mask, cpu_online_mask) - < nr_cpu_ids)) - if (!chip->irq_set_affinity(&desc->irq_data, - desc->pending_mask, false)) { + < nr_cpu_ids)) { + int ret = chip->irq_set_affinity(&desc->irq_data, + desc->pending_mask, false); + switch (ret) { + case IRQ_SET_MASK_OK: cpumask_copy(desc->irq_data.affinity, desc->pending_mask); + case IRQ_SET_MASK_OK_NOCOPY: irq_set_thread_affinity(desc); } + } cpumask_clear(desc->pending_mask); }