The patch titled
irq-flags: ide: Use the new IRQF_ constansts
has been added to the -mm tree. Its filename is
irq-flags-ide-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: ide: 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: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/ide-probe.c | 10 +++++-----
drivers/ide/legacy/hd.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff -puN drivers/ide/ide-probe.c~irq-flags-ide-use-the-new-irqf_-constansts drivers/ide/ide-probe.c
--- a/drivers/ide/ide-probe.c~irq-flags-ide-use-the-new-irqf_-constansts
+++ a/drivers/ide/ide-probe.c
@@ -1004,7 +1004,7 @@ static int ide_init_queue(ide_drive_t *d
* and irq serialization situations. This is somewhat complex because
* it handles static as well as dynamic (PCMCIA) IDE interfaces.
*
- * The SA_INTERRUPT in sa_flags means ide_intr() is always entered with
+ * The IRQF_DISABLED in sa_flags means ide_intr() is always entered with
* interrupts completely disabled. This can be bad for interrupt latency,
* but anything else has led to problems on some machines. We re-enable
* interrupts as much as we can safely do in most places.
@@ -1090,15 +1090,15 @@ static int init_irq (ide_hwif_t *hwif)
* Allocate the irq, if not already obtained for another hwif
*/
if (!match || match->irq != hwif->irq) {
- int sa = SA_INTERRUPT;
+ int sa = IRQF_DISABLED;
#if defined(__mc68000__) || defined(CONFIG_APUS)
- sa = SA_SHIRQ;
+ sa = IRQF_SHARED;
#endif /* __mc68000__ || CONFIG_APUS */
if (IDE_CHIPSET_IS_PCI(hwif->chipset)) {
- sa = SA_SHIRQ;
+ sa = IRQF_SHARED;
#ifndef CONFIG_IDEPCI_SHARE_IRQ
- sa |= SA_INTERRUPT;
+ sa |= IRQF_DISABLED;
#endif /* CONFIG_IDEPCI_SHARE_IRQ */
}
diff -puN drivers/ide/legacy/hd.c~irq-flags-ide-use-the-new-irqf_-constansts drivers/ide/legacy/hd.c
--- a/drivers/ide/legacy/hd.c~irq-flags-ide-use-the-new-irqf_-constansts
+++ a/drivers/ide/legacy/hd.c
@@ -691,7 +691,7 @@ static struct block_device_operations hd
};
/*
- * This is the hard disk IRQ description. The SA_INTERRUPT in sa_flags
+ * This is the hard disk IRQ description. The IRQF_DISABLED in sa_flags
* means we run the IRQ-handler with interrupts disabled: this is bad for
* interrupt latency, but anything else has led to problems on some
* machines.
@@ -806,7 +806,7 @@ static int __init hd_init(void)
p->cyl, p->head, p->sect);
}
- if (request_irq(HD_IRQ, hd_interrupt, SA_INTERRUPT, "hd", NULL)) {
+ if (request_irq(HD_IRQ, hd_interrupt, IRQF_DISABLED, "hd", NULL)) {
printk("hd: unable to get IRQ%d for the hard disk driver\n",
HD_IRQ);
goto out1;
_
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
