From d24501276a53094431c71a6723e00051ef63f266 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Wed, 21 Mar 2012 17:22:35 +0100 Subject: [PATCH] --- yaml --- r: 298199 b: refs/heads/master c: f3f79e38d51f8a419f4c484a86ece4baea35b993 h: refs/heads/master i: 298197: 86eaab87ddde092d1a9f41f45ca2800368aa7a31 298195: 8984e12f4bfbf4da978dd2ce23634e2603f31bc2 298191: ad5d21fa5b100a2af04cc12fe97088661439761f v: v3 --- [refs] | 2 +- trunk/kernel/irq/manage.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0c6605021017..620ef1b6e2bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69592db298e400a7c175c4dfbe7a086c783f349d +refs/heads/master: f3f79e38d51f8a419f4c484a86ece4baea35b993 diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index b0ccd1ac2d6a..bf606a53a21c 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -645,7 +645,7 @@ static int irq_wait_for_interrupt(struct irqaction *action) * is marked MASKED. */ static void irq_finalize_oneshot(struct irq_desc *desc, - struct irqaction *action, bool force) + struct irqaction *action) { if (!(desc->istate & IRQS_ONESHOT)) return; @@ -679,7 +679,7 @@ static void irq_finalize_oneshot(struct irq_desc *desc, * we would clear the threads_oneshot bit of this thread which * was just set. */ - if (!force && test_bit(IRQTF_RUNTHREAD, &action->thread_flags)) + if (test_bit(IRQTF_RUNTHREAD, &action->thread_flags)) goto out_unlock; desc->threads_oneshot &= ~action->thread_mask; @@ -739,7 +739,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action) local_bh_disable(); ret = action->thread_fn(action->irq, action->dev_id); - irq_finalize_oneshot(desc, action, false); + irq_finalize_oneshot(desc, action); local_bh_enable(); return ret; } @@ -755,7 +755,7 @@ static irqreturn_t irq_thread_fn(struct irq_desc *desc, irqreturn_t ret; ret = action->thread_fn(action->irq, action->dev_id); - irq_finalize_oneshot(desc, action, false); + irq_finalize_oneshot(desc, action); return ret; } @@ -844,7 +844,7 @@ void exit_irq_thread(void) wake_threads_waitq(desc); /* Prevent a stale desc->threads_oneshot */ - irq_finalize_oneshot(desc, action, true); + irq_finalize_oneshot(desc, action); } static void irq_setup_forced_threading(struct irqaction *new)