lkml.org 
[lkml]   [2011]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:irq/core] genirq: Do not fiddle with IRQ_MASKED in handle_edge_irq()
    Commit-ID:  d78f8dd36b90626106ce19cb2e6828b0dc39447e
    Gitweb: http://git.kernel.org/tip/d78f8dd36b90626106ce19cb2e6828b0dc39447e
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Wed, 2 Feb 2011 21:41:17 +0000
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Sat, 19 Feb 2011 12:58:11 +0100

    genirq: Do not fiddle with IRQ_MASKED in handle_edge_irq()

    IRQ_MASKED is set in mask_ack_irq() anyway. Remove it from
    handle_edge_irq() to allow simpler ab^HHreuse of that function.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Peter Zijlstra <peterz@infradead.org>
    LKML-Reference: <20110202212551.918484270@linutronix.de>
    ---
    kernel/irq/chip.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
    index 43c62ca..2c30b78 100644
    --- a/kernel/irq/chip.c
    +++ b/kernel/irq/chip.c
    @@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
    if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
    !desc->action)) {
    if (!irq_check_poll(desc)) {
    - desc->status |= (IRQ_PENDING | IRQ_MASKED);
    + desc->status |= IRQ_PENDING;
    mask_ack_irq(desc);
    goto out_unlock;
    }

    \
     
     \ /
      Last update: 2011-02-19 13:27    [W:5.005 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site