lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 1/4] IRQ: correctly handle return value from chip->irq_set_affinity() in irq_move_masked_irq()
    Date
    chip->irq_set_affinity() may return IRQ_SET_MASK_OK_NOCOPY if the mask has
    been copied to desc->irq_data.affinity, but irq_move_masked_irq() incorrectly
    treats that return value as error code.

    Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
    ---
    kernel/irq/migration.c | 10 +++++++---
    1 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
    index 4742090..c3c8975 100644
    --- a/kernel/irq/migration.c
    +++ b/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);
    }
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-03-30 17:23    [W:0.032 / U:29.396 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site