The patch titled
irq-flags: drivers/block Use the new IRQF_ constansts
has been added to the -mm tree. Its filename is
irq-flags-drivers-block-use-the-new-irqf_-constansts.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: irq-flags: drivers/block Use the new IRQF_ constansts
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/block/DAC960.c | 2 +-
drivers/block/cciss.c | 2 +-
drivers/block/cpqarray.c | 2 +-
drivers/block/ps2esdi.c | 4 ++--
drivers/block/sx8.c | 2 +-
drivers/block/umem.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff -puN drivers/block/cciss.c~irq-flags-drivers-block-use-the-new-irqf_-constansts drivers/block/cciss.c
--- a/drivers/block/cciss.c~irq-flags-drivers-block-use-the-new-irqf_-constansts
+++ a/drivers/block/cciss.c
@@ -3159,7 +3159,7 @@ 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 (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
- SA_INTERRUPT | SA_SHIRQ, hba[i]->devname, hba[i])) {
+ IRQF_DISABLED | IRQF_SHARED, 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);
goto clean2;
diff -puN drivers/block/cpqarray.c~irq-flags-drivers-block-use-the-new-irqf_-constansts drivers/block/cpqarray.c
--- a/drivers/block/cpqarray.c~irq-flags-drivers-block-use-the-new-irqf_-constansts
+++ a/drivers/block/cpqarray.c
@@ -408,7 +408,7 @@ static int __init cpqarray_register_ctlr
}
hba[i]->access.set_intr_mask(hba[i], 0);
if (request_irq(hba[i]->intr, do_ida_intr,
- SA_INTERRUPT|SA_SHIRQ, hba[i]->devname, hba[i]))
+ IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
{
printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
hba[i]->intr, hba[i]->devname);
diff -puN drivers/block/DAC960.c~irq-flags-drivers-block-use-the-new-irqf_-constansts drivers/block/DAC960.c
--- a/drivers/block/DAC960.c~irq-flags-drivers-block-use-the-new-irqf_-constansts
+++ a/drivers/block/DAC960.c
@@ -3014,7 +3014,7 @@ DAC960_DetectController(struct pci_dev *
Acquire shared access to the IRQ Channel.
*/
IRQ_Channel = PCI_Device->irq;
- if (request_irq(IRQ_Channel, InterruptHandler, SA_SHIRQ,
+ if (request_irq(IRQ_Channel, InterruptHandler, IRQF_SHARED,
Controller->FullModelName, Controller) < 0)
{
DAC960_Error("Unable to acquire IRQ Channel %d for Controller at\n",
diff -puN drivers/block/ps2esdi.c~irq-flags-drivers-block-use-the-new-irqf_-constansts drivers/block/ps2esdi.c
--- a/drivers/block/ps2esdi.c~irq-flags-drivers-block-use-the-new-irqf_-constansts
+++ a/drivers/block/ps2esdi.c
@@ -340,9 +340,9 @@ static int __init ps2esdi_geninit(void)
/* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can
share with the SCSI driver */
if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
- SA_INTERRUPT | SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk)
+ IRQF_DISABLED | IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
&& request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
- SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk)
+ IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
) {
printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ);
error = -EBUSY;
diff -puN drivers/block/sx8.c~irq-flags-drivers-block-use-the-new-irqf_-constansts drivers/block/sx8.c
--- a/drivers/block/sx8.c~irq-flags-drivers-block-use-the-new-irqf_-constansts
+++ a/drivers/block/sx8.c
@@ -1676,7 +1676,7 @@ static int carm_init_one (struct pci_dev
pci_set_master(pdev);
- rc = request_irq(pdev->irq, carm_interrupt, SA_SHIRQ, DRV_NAME, host);
+ rc = request_irq(pdev->irq, carm_interrupt, IRQF_SHARED, DRV_NAME, host);
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): irq alloc failure\n",
pci_name(pdev));
diff -puN drivers/block/umem.c~irq-flags-drivers-block-use-the-new-irqf_-constansts drivers/block/umem.c
--- a/drivers/block/umem.c~irq-flags-drivers-block-use-the-new-irqf_-constansts
+++ a/drivers/block/umem.c
@@ -1040,7 +1040,7 @@ static int __devinit mm_pci_probe(struct
card->win_size = data;
- if (request_irq(dev->irq, mm_interrupt, SA_SHIRQ, "pci-umem", card)) {
+ if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, "pci-umem", card)) {
printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card->card_number);
ret = -ENODEV;
_
Patches currently in -mm which might be from tglx@xxxxxxxxxxxxx are
origin.patch
irq-use-sa_percpu_irq-not-irq_per_cpu-for-irqactionflags.patch
irq-warning-message-cleanup.patch
irq-flags-consolidate-flags-for-request_irq.patch
irq-flags-alpha-use-the-new-irqf_-constansts.patch
irq-flags-arm26-use-the-new-irqf_-constansts.patch
irq-flags-arm-use-the-new-irqf_-constansts.patch
irq-flags-chris-use-the-new-irqf_-constansts.patch
irq-flags-frv-use-the-new-irqf_-constansts.patch
irq-flags-h8300-use-the-new-irqf_-constansts.patch
irq-flags-i386-use-the-new-irqf_-constansts.patch
irq-flags-ia64-use-the-new-irqf_-constansts.patch
irq-flags-m32r-use-the-new-irqf_-constansts.patch
irq-flags-m68knommu-use-the-new-irqf_-constansts.patch
irq-flags-m68k-use-the-new-irqf_-constansts.patch
irq-flags-mips-use-the-new-irqf_-constansts.patch
irq-flags-parisc-use-the-new-irqf_-constansts.patch
irq-flags-powerpc-use-the-new-irqf_-constansts.patch
irq-flags-ppc-use-the-new-irqf_-constansts.patch
irq-flags-s390-use-the-new-irqf_-constansts.patch
irq-flags-sh64-use-the-new-irqf_-constansts.patch
irq-flags-sh-use-the-new-irqf_-constansts.patch
irq-flags-sparc64-use-the-new-irqf_-constansts.patch
irq-flags-sparc-use-the-new-irqf_-constansts.patch
irq-flags-um-use-the-new-irqf_-constansts.patch
irq-flags-v850-use-the-new-irqf_-constansts.patch
irq-flags-x86_64-use-the-new-irqf_-constansts.patch
irq-flags-xtensa-use-the-new-irqf_-constansts.patch
irq-flags-generic-irq-use-the-new-irqf_-constansts.patch
irq-flags-drivers-block-use-the-new-irqf_-constansts.patch
irq-flags-drivers-char-use-the-new-irqf_-constansts.patch
irq-flags-drivers-drm-use-the-new-irqf_-constansts.patch
irq-flags-ide-use-the-new-irqf_-constansts.patch
irq-flags-firewire-use-the-new-irqf_-constansts.patch
irq-flags-isdn-use-the-new-irqf_-constansts.patch
irq-flags-media-use-the-new-irqf_-constansts.patch
irq-flags-misc-drivers-use-the-new-irqf_-constansts.patch
irq-flags-drivers-net-use-the-new-irqf_-constansts.patch
irq-flags-parisc-use-the-new-irqf_-constansts-2.patch
irq-flags-pci-use-the-new-irqf_-constansts.patch
irq-flags-rio-use-the-new-irqf_-constansts.patch
irq-flags-scsi-use-the-new-irqf_-constansts.patch
irq-flags-serial-use-the-new-irqf_-constansts.patch
irq-flags-usb-use-the-new-irqf_-constansts.patch
irq-flags-video-use-the-new-irqf_-constansts.patch
irq-flags-sound-use-the-new-irqf_-constansts.patch
irq-flags-documentation-use-the-new-irqf_-constansts.patch
git-mtd.patch
lockdep-add-disable-enable_irq_lockdep-api.patch
genirq-convert-the-x86_64-architecture-to-irq-chips.patch
genirq-convert-the-i386-architecture-to-irq-chips.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-x86_64-irq-reenable-migrating-irqs-to-other-cpus-fix.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-ia64-irq-dynamic-irq-support-fix.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
-
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
