diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/manage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index b0ccd1ac2d6a..bf606a53a21c 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -645,7 +645,7 @@ static int irq_wait_for_interrupt(struct irqaction *action) | |||
| 645 | * is marked MASKED. | 645 | * is marked MASKED. |
| 646 | */ | 646 | */ |
| 647 | static void irq_finalize_oneshot(struct irq_desc *desc, | 647 | static void irq_finalize_oneshot(struct irq_desc *desc, |
| 648 | struct irqaction *action, bool force) | 648 | struct irqaction *action) |
| 649 | { | 649 | { |
| 650 | if (!(desc->istate & IRQS_ONESHOT)) | 650 | if (!(desc->istate & IRQS_ONESHOT)) |
| 651 | return; | 651 | return; |
| @@ -679,7 +679,7 @@ again: | |||
| 679 | * we would clear the threads_oneshot bit of this thread which | 679 | * we would clear the threads_oneshot bit of this thread which |
| 680 | * was just set. | 680 | * was just set. |
| 681 | */ | 681 | */ |
| 682 | if (!force && test_bit(IRQTF_RUNTHREAD, &action->thread_flags)) | 682 | if (test_bit(IRQTF_RUNTHREAD, &action->thread_flags)) |
| 683 | goto out_unlock; | 683 | goto out_unlock; |
| 684 | 684 | ||
| 685 | desc->threads_oneshot &= ~action->thread_mask; | 685 | desc->threads_oneshot &= ~action->thread_mask; |
| @@ -739,7 +739,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action) | |||
| 739 | 739 | ||
| 740 | local_bh_disable(); | 740 | local_bh_disable(); |
| 741 | ret = action->thread_fn(action->irq, action->dev_id); | 741 | ret = action->thread_fn(action->irq, action->dev_id); |
| 742 | irq_finalize_oneshot(desc, action, false); | 742 | irq_finalize_oneshot(desc, action); |
| 743 | local_bh_enable(); | 743 | local_bh_enable(); |
| 744 | return ret; | 744 | return ret; |
| 745 | } | 745 | } |
| @@ -755,7 +755,7 @@ static irqreturn_t irq_thread_fn(struct irq_desc *desc, | |||
| 755 | irqreturn_t ret; | 755 | irqreturn_t ret; |
| 756 | 756 | ||
| 757 | ret = action->thread_fn(action->irq, action->dev_id); | 757 | ret = action->thread_fn(action->irq, action->dev_id); |
| 758 | irq_finalize_oneshot(desc, action, false); | 758 | irq_finalize_oneshot(desc, action); |
| 759 | return ret; | 759 | return ret; |
| 760 | } | 760 | } |
| 761 | 761 | ||
| @@ -844,7 +844,7 @@ void exit_irq_thread(void) | |||
| 844 | wake_threads_waitq(desc); | 844 | wake_threads_waitq(desc); |
| 845 | 845 | ||
| 846 | /* Prevent a stale desc->threads_oneshot */ | 846 | /* Prevent a stale desc->threads_oneshot */ |
| 847 | irq_finalize_oneshot(desc, action, true); | 847 | irq_finalize_oneshot(desc, action); |
| 848 | } | 848 | } |
| 849 | 849 | ||
| 850 | static void irq_setup_forced_threading(struct irqaction *new) | 850 | static void irq_setup_forced_threading(struct irqaction *new) |
