The patch titled irq-flags: documentation: Use the new IRQF_ constansts has been added to the -mm tree. Its filename is irq-flags-documentation-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: documentation: 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: "Randy.Dunlap" <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- Documentation/DocBook/videobook.tmpl | 2 +- Documentation/pci.txt | 2 +- Documentation/scsi/tmscsim.txt | 2 +- Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff -puN Documentation/DocBook/videobook.tmpl~irq-flags-documentation-use-the-new-irqf_-constansts Documentation/DocBook/videobook.tmpl --- a/Documentation/DocBook/videobook.tmpl~irq-flags-documentation-use-the-new-irqf_-constansts +++ a/Documentation/DocBook/videobook.tmpl @@ -976,7 +976,7 @@ static int camera_close(struct video_dev <title>Interrupt Handling</title> <para> Our example handler is for an ISA bus device. If it was PCI you would be - able to share the interrupt and would have set SA_SHIRQ to indicate a + able to share the interrupt and would have set IRQF_SHARED to indicate a shared IRQ. We pass the device pointer as the interrupt routine argument. We don't need to since we only support one card but doing this will make it easier to upgrade the driver for multiple devices in the future. diff -puN Documentation/pci.txt~irq-flags-documentation-use-the-new-irqf_-constansts Documentation/pci.txt --- a/Documentation/pci.txt~irq-flags-documentation-use-the-new-irqf_-constansts +++ a/Documentation/pci.txt @@ -225,7 +225,7 @@ Generic flavors of pci_request_region() Use these for address resources that are not described by "normal" PCI interfaces (e.g. BAR). - All interrupt handlers should be registered with SA_SHIRQ and use the devid + All interrupt handlers should be registered with IRQF_SHARED and use the devid to map IRQs to devices (remember that all PCI interrupts are shared). diff -puN Documentation/scsi/tmscsim.txt~irq-flags-documentation-use-the-new-irqf_-constansts Documentation/scsi/tmscsim.txt --- a/Documentation/scsi/tmscsim.txt~irq-flags-documentation-use-the-new-irqf_-constansts +++ a/Documentation/scsi/tmscsim.txt @@ -109,7 +109,7 @@ than the 33.33 MHz being in the PCI spec If you want to share the IRQ with another device and the driver refuses to do so, you might succeed with changing the DC390_IRQ type in tmscsim.c to -SA_SHIRQ | SA_INTERRUPT. +IRQF_SHARED | IRQF_DISABLED. 3.Features diff -puN Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl~irq-flags-documentation-use-the-new-irqf_-constansts Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl --- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl~irq-flags-documentation-use-the-new-irqf_-constansts +++ a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl @@ -1149,7 +1149,7 @@ } chip->port = pci_resource_start(pci, 0); if (request_irq(pci->irq, snd_mychip_interrupt, - SA_INTERRUPT|SA_SHIRQ, "My Chip", chip)) { + IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) { printk(KERN_ERR "cannot grab irq %d\n", pci->irq); snd_mychip_free(chip); return -EBUSY; @@ -1323,7 +1323,7 @@ <programlisting> <![CDATA[ if (request_irq(pci->irq, snd_mychip_interrupt, - SA_INTERRUPT|SA_SHIRQ, "My Chip", chip)) { + IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) { printk(KERN_ERR "cannot grab irq %d\n", pci->irq); snd_mychip_free(chip); return -EBUSY; @@ -1342,7 +1342,7 @@ <para> On the PCI bus, the interrupts can be shared. Thus, - <constant>SA_SHIRQ</constant> is given as the interrupt flag of + <constant>IRQF_SHARED</constant> is given as the interrupt flag of <function>request_irq()</function>. </para> _ 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