The patch titled genirq: warn about IRQF_SHARED|IRQF_DISABLED at the right place has been added to the -mm tree. Its filename is genirq-warn-about-irqf_sharedirqf_disabled-at-the-right-place.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: genirq: warn about IRQF_SHARED|IRQF_DISABLED at the right place From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> For shared irqs IRQF_DISABLED is only guaranteed for the first handler. So only warn starting at the second registration. The warning is moved to __setup_irq having the additional benefit of catching actions registered using setup_irq not only register_irq. This doesn't fix the cases where setup order is wrong but it should report the broken cases more reliably. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Nicolas Pitre <nico@xxxxxxxxxxx> Cc: Eric Miao <eric.y.miao@xxxxxxxxx> Cc: John Stultz <johnstul@xxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Remy Bohmer <linux@xxxxxxxxxx> Cc: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx> Cc: Andrea Gallo <andrea.gallo@xxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Jamie Lokier <jamie@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/irq/manage.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff -puN kernel/irq/manage.c~genirq-warn-about-irqf_sharedirqf_disabled-at-the-right-place kernel/irq/manage.c --- a/kernel/irq/manage.c~genirq-warn-about-irqf_sharedirqf_disabled-at-the-right-place +++ a/kernel/irq/manage.c @@ -702,6 +702,16 @@ __setup_irq(unsigned int irq, struct irq goto mismatch; #endif + /* + * handle_IRQ_event() only honors IRQF_DISABLED for the _first_ + * irqaction. As the first handler might reenable irqs all bets + * are off for the later handlers even if the first one has + * IRQF_DISABLED, too. + */ + if (new->flags & IRQF_DISABLED) + pr_warning("IRQ %d/%s: IRQF_DISABLED is not guaranteed " + "on shared IRQs\n", irq, new->name); + /* add new interrupt at end of irq queue */ do { old_ptr = &old->next; @@ -1008,19 +1018,6 @@ int request_threaded_irq(unsigned int ir struct irq_desc *desc; int retval; - /* - * handle_IRQ_event() always ignores IRQF_DISABLED except for - * the _first_ irqaction (sigh). That can cause oopsing, but - * the behavior is classified as "will not fix" so we need to - * start nudging drivers away from using that idiom. - */ - if ((irqflags & (IRQF_SHARED|IRQF_DISABLED)) == - (IRQF_SHARED|IRQF_DISABLED)) { - pr_warning( - "IRQ %d/%s: IRQF_DISABLED is not guaranteed on shared IRQs\n", - irq, devname); - } - #ifdef CONFIG_LOCKDEP /* * Lockdep wants atomic interrupt handlers: _ Patches currently in -mm which might be from u.kleine-koenig@xxxxxxxxxxxxxx are linux-next.patch mtd-nand-fix-build-failure-caused-by-typo.patch hrtimer-correct-a-few-numbers-in-comments.patch clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path.patch genirq-warn-about-irqf_sharedirqf_disabled-at-the-right-place.patch spi-mpc8xxx-dont-check-platform_get_irqs-return-value-against-zero.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html