The patch titled genirq: fasteoi handler: handle interrupt disabling has been added to the -mm tree. Its filename is genirq-add-irq-chip-support-fasteoi-handler-handle-interrupt-disabling.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: genirq: fasteoi handler: handle interrupt disabling From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Note when a disable interrupt happened with the fasteoi handler as well so that delayed disable can be implemented with fasteoi-type controllers. Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Acked-by: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- kernel/irq/chip.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN kernel/irq/chip.c~genirq-add-irq-chip-support-fasteoi-handler-handle-interrupt-disabling kernel/irq/chip.c --- a/kernel/irq/chip.c~genirq-add-irq-chip-support-fasteoi-handler-handle-interrupt-disabling +++ a/kernel/irq/chip.c @@ -311,10 +311,13 @@ handle_fastack_irq(unsigned int irq, str * keep it masked and get out of here */ action = desc->action; - if (unlikely(!action || (desc->status & IRQ_DISABLED))) + if (unlikely(!action || (desc->status & IRQ_DISABLED))) { + desc->status |= IRQ_PENDING; goto out; + } desc->status |= IRQ_INPROGRESS; + desc->status &= ~IRQ_PENDING; spin_unlock(&desc->lock); action_ret = handle_IRQ_event(irq, regs, action); _ Patches currently in -mm which might be from benh@xxxxxxxxxxxxxxxxxxx are origin.patch macintosh-mangle-caps-lock-events-on-adb-keyboards.patch via-pmu-add-input-device.patch git-powerpc.patch m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs.patch work-around-ppc64-bootup-bug-by-making-mutex-debugging-save-restore-irqs.patch add-poisonh-and-patch-primary-users.patch x86-powerpc-make-hardirq_ctx-and-softirq_ctx-__read_mostly.patch rewritten-backlight-infrastructure-for-portable-apple-computers.patch rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch apple-motion-sensor-driver.patch fix-broken-dubious-driver-suspend-methods.patch radeonfb-powerdrain-issue-on-ibm-thinkpads-and-suspend-to-d2.patch genirq-msi-fixes-2.patch genirq-add-irq-chip-support-fix.patch genirq-add-irq-chip-support-fasteoi-handler-handle-interrupt-disabling.patch genirq-add-chip-eoi-fastack-fasteoi.patch genirq-add-chip-eoi-fastack-fasteoi-fix.patch genirq-irq-convert-the-move_irq-flag-from-a-32bit-word-to-a-single-bit.patch genirq-irq-add-moved_masked_irq.patch genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch genirq-msi-simplify-msi-enable-and-disable.patch genirq-msi-simplify-msi-enable-and-disable-fix.patch genirq-msi-make-the-msi-boolean-tests-return-either-0-or-1.patch genirq-msi-implement-helper-functions-read_msi_msg-and-write_msi_msg.patch genirq-msi-refactor-the-msi_ops.patch genirq-msi-simplify-the-msi-irq-limit-policy.patch genirq-irq-add-a-dynamic-irq-creation-api.patch genirq-ia64-irq-dynamic-irq-support.patch genirq-i386-irq-dynamic-irq-support.patch genirq-i386-irq-dynamic-irq-support-fix.patch genirq-x86_64-irq-dynamic-irq-support.patch genirq-msi-make-the-msi-code-irq-based-and-not-vector-based.patch genirq-x86_64-irq-move-msi-message-composition-into-io_apicc.patch genirq-i386-irq-move-msi-message-composition-into-io_apicc.patch genirq-msi-only-build-msi-apicc-on-ia64.patch genirq-x86_64-irq-remove-the-msi-assumption-that-irq-==-vector.patch genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector-fix.patch genirq-irq-remove-msi-hacks.patch genirq-irq-generalize-the-check-for-hardirq_bits.patch genirq-x86_64-irq-make-the-external-irq-handlers-report-their-vector-not-the-irq-number.patch genirq-x86_64-irq-make-vector_irq-per-cpu.patch genirq-x86_64-irq-kill-gsi_irq_sharing.patch genirq-x86_64-irq-kill-irq-compression.patch genirq-irq-document-what-an-irq-is.patch lock-validator-add-per_cpu_offset-fix.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