On Thu, Apr 08 2021 at 16:43, Valentin Schneider wrote:
> A subsequent patch will let IRQs end up in irq_finalize_oneshot() without
> IRQD_IRQ_MASKED, but with IRQD_IRQ_FLOW_MASKED set instead. Let such IRQs
> receive their final ->irq_eoi().
>
> Signed-off-by: Valentin Schneider <valentin.schnei...@arm.com>
> ---
> kernel/irq/manage.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index e976c4927b25..59c8056d6714 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -1076,7 +1076,7 @@ static void irq_finalize_oneshot(struct irq_desc *desc,
> desc->threads_oneshot &= ~action->thread_mask;
>
> if (!desc->threads_oneshot && !irqd_irq_disabled(&desc->irq_data) &&
> - irqd_irq_masked(&desc->irq_data))
> + (irqd_irq_masked(&desc->irq_data) ||
> irqd_irq_flow_masked(&desc->irq_data)))
> unmask_threaded_irq(desc);
This creates better code when you have '|' instead of '||' because the
compiler can spare a conditional and combine the bit check into one.
Thanks,
tglx
