The patch titled cciss: make sure we request the performant mode irq has been added to the -mm tree. Its filename is cciss-clean-up-interrupt-handler-make-sure-we-request-the-performant-mode-irq.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: cciss: make sure we request the performant mode irq From: Mike Miller <mike.miller@xxxxxx> Make sure we register the performant mode interrupt Another blunder. Seemed to work because the call to put_controller_into_performant_mode was never called. Signed-off-by: Mike Miller <mike.miller@xxxxxx> Cc: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/block/cciss.c~cciss-clean-up-interrupt-handler-make-sure-we-request-the-performant-mode-irq drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-clean-up-interrupt-handler-make-sure-we-request-the-performant-mode-irq +++ a/drivers/block/cciss.c @@ -4308,18 +4308,18 @@ static int __devinit cciss_init_one(stru /* make sure the board interrupts are off */ hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); if (hba[i]->msi_vector || hba[i]->msix_vector) { - if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], + if (request_irq(hba[i]->intr[PERF_MODE_INT], do_cciss_msix_intr, IRQF_DISABLED, hba[i]->devname, hba[i])) { printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", - hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); + hba[i]->intr[PERF_MODE_INT], hba[i]->devname); goto clean2; } } else { - if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intx, + if (request_irq(hba[i]->intr[PERF_MODE_INT], do_cciss_intx, IRQF_DISABLED, hba[i]->devname, hba[i])) { printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", - hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); + hba[i]->intr[PERF_MODE_INT], hba[i]->devname); goto clean2; } } _ Patches currently in -mm which might be from mike.miller@xxxxxx are cciss-enqueue-and-submit-io.patch cciss-clean-up-interrupt-handler.patch cciss-clean-up-interrupt-handler-make-sure-we-request-the-performant-mode-irq.patch cciss-check-for-msi-in-interrupt_not_for_us.patch cciss-make-interrupt-access-methods-return-type-bool.patch cciss-add-performant-mode-support-for-stars-sirius.patch cciss-add-performant-mode-support-for-stars-sirius-fix-call-to-put_controller_in_performant_mode.patch cciss-add-performant-mode-support-for-stars-sirius-move-next_command-function-from-ifdef.patch cciss-add-performant-mode-support-for-stars-sirius-remove-errant-debug-code.patch cciss-add-performant-mode-support-for-stars-sirius-change-pad-value-from-32-to-0.patch cciss-new-controller-support-and-bump-driver-version.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