From: Thomas Gleixner The obsolete SA_xxx interrupt flags have been used despite the scheduled removal. Fixup the remaining users. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: "Luck, Tony" Cc: Roman Zippel Cc: Geert Uytterhoeven Cc: Jeff Garzik Cc: Wim Van Sebroeck Cc: Roland Dreier Cc: Alessandro Zummo Cc: James Bottomley Cc: Greg KH Cc: Dave Airlie Cc: James Simmons Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton --- arch/ia64/kernel/irq_ia64.c | 2 +- arch/m68k/atari/stdma.c | 2 +- arch/ppc/syslib/i8259.c | 2 +- drivers/ata/pata_mpiix.c | 2 +- drivers/ata/pata_pcmcia.c | 2 +- drivers/ata/pata_pdc2027x.c | 4 ++-- drivers/char/watchdog/rm9k_wdt.c | 2 +- drivers/infiniband/hw/amso1100/c2.c | 2 +- drivers/infiniband/hw/ehca/ehca_eq.c | 4 ++-- drivers/misc/tifm_7xx1.c | 2 +- drivers/net/7990.c | 2 +- drivers/net/ehea/ehea_main.c | 8 ++++---- drivers/net/macb.c | 2 +- drivers/net/netxen/netxen_nic_main.c | 4 ++-- drivers/net/qla3xxx.c | 4 ++-- drivers/net/ucc_geth.c | 4 ++-- drivers/pci/pcie/aer/aerdrv.c | 2 +- drivers/rtc/rtc-omap.c | 4 ++-- drivers/rtc/rtc-s3c.c | 4 ++-- drivers/scsi/aic94xx/aic94xx_init.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/usb/gadget/pxa2xx_udc.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 +- drivers/usb/host/ohci-pnx4008.c | 2 +- drivers/usb/host/ohci-pnx8550.c | 2 +- drivers/video/intelfb/intelfbhw.c | 3 ++- kernel/irq/manage.c | 2 +- 29 files changed, 40 insertions(+), 39 deletions(-) diff -puN arch/ia64/kernel/irq_ia64.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups arch/ia64/kernel/irq_ia64.c --- a/arch/ia64/kernel/irq_ia64.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/arch/ia64/kernel/irq_ia64.c @@ -275,7 +275,7 @@ static struct irqaction ipi_irqaction = static struct irqaction resched_irqaction = { .handler = dummy_handler, - .flags = SA_INTERRUPT, + .flags = IRQF_DISABLED, .name = "resched" }; #endif diff -puN arch/m68k/atari/stdma.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups arch/m68k/atari/stdma.c --- a/arch/m68k/atari/stdma.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/arch/m68k/atari/stdma.c @@ -174,7 +174,7 @@ int stdma_islocked(void) void __init stdma_init(void) { stdma_isr = NULL; - request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | SA_SHIRQ, + request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, "ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int); } diff -puN arch/ppc/syslib/i8259.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups arch/ppc/syslib/i8259.c --- a/arch/ppc/syslib/i8259.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/arch/ppc/syslib/i8259.c @@ -154,7 +154,7 @@ static struct resource pic_edgectrl_iore static struct irqaction i8259_irqaction = { .handler = no_action, - .flags = SA_INTERRUPT, + .flags = IRQF_DISABLED, .mask = CPU_MASK_NONE, .name = "82c59 secondary cascade", }; diff -puN drivers/ata/pata_mpiix.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/ata/pata_mpiix.c --- a/drivers/ata/pata_mpiix.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/ata/pata_mpiix.c @@ -229,7 +229,7 @@ static int mpiix_init_one(struct pci_dev probe[0].sht = &mpiix_sht; probe[0].pio_mask = 0x1F; probe[0].irq = 14; - probe[0].irq_flags = SA_SHIRQ; + probe[0].irq_flags = IRQF_SHARED; probe[0].port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST; probe[0].n_ports = 1; probe[0].port[0].cmd_addr = 0x1F0; diff -puN drivers/ata/pata_pcmcia.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/ata/pata_pcmcia.c --- a/drivers/ata/pata_pcmcia.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/ata/pata_pcmcia.c @@ -256,7 +256,7 @@ next_entry: ae.n_ports = 1; ae.pio_mask = 1; /* ISA so PIO 0 cycles */ ae.irq = pdev->irq.AssignedIRQ; - ae.irq_flags = SA_SHIRQ; + ae.irq_flags = IRQF_SHARED; ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST; ae.port[0].cmd_addr = io_base; ae.port[0].altstatus_addr = ctl_base; diff -puN drivers/ata/pata_pdc2027x.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/ata/pata_pdc2027x.c --- a/drivers/ata/pata_pdc2027x.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/ata/pata_pdc2027x.c @@ -804,8 +804,8 @@ static int __devinit pdc2027x_init_one(s probe_ent->udma_mask = pdc2027x_port_info[board_idx].udma_mask; probe_ent->port_ops = pdc2027x_port_info[board_idx].port_ops; - probe_ent->irq = pdev->irq; - probe_ent->irq_flags = SA_SHIRQ; + probe_ent->irq = pdev->irq; + probe_ent->irq_flags = IRQF_SHARED; probe_ent->mmio_base = mmio_base; pdc_ata_setup_port(&probe_ent->port[0], base + 0x17c0); diff -puN drivers/char/watchdog/rm9k_wdt.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/char/watchdog/rm9k_wdt.c --- a/drivers/char/watchdog/rm9k_wdt.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/char/watchdog/rm9k_wdt.c @@ -192,7 +192,7 @@ static int wdt_gpi_open(struct inode *in locked = 0; } - res = request_irq(wd_irq, wdt_gpi_irqhdl, SA_SHIRQ | SA_INTERRUPT, + res = request_irq(wd_irq, wdt_gpi_irqhdl, IRQF_SHARED | IRQF_DISABLED, wdt_gpi_name, &miscdev); if (unlikely(res)) return res; diff -puN drivers/infiniband/hw/amso1100/c2.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/infiniband/hw/amso1100/c2.c --- a/drivers/infiniband/hw/amso1100/c2.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/infiniband/hw/amso1100/c2.c @@ -1073,7 +1073,7 @@ static int __devinit c2_probe(struct pci 0xffffc000) / sizeof(struct c2_rxp_desc); /* Request an interrupt line for the driver */ - ret = request_irq(pcidev->irq, c2_interrupt, SA_SHIRQ, DRV_NAME, c2dev); + ret = request_irq(pcidev->irq, c2_interrupt, IRQF_SHARED, DRV_NAME, c2dev); if (ret) { printk(KERN_ERR PFX "%s: requested IRQ %u is busy\n", pci_name(pcidev), pcidev->irq); diff -puN drivers/infiniband/hw/ehca/ehca_eq.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/infiniband/hw/ehca/ehca_eq.c --- a/drivers/infiniband/hw/ehca/ehca_eq.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/infiniband/hw/ehca/ehca_eq.c @@ -122,7 +122,7 @@ int ehca_create_eq(struct ehca_shca *shc /* register interrupt handlers and initialize work queues */ if (type == EHCA_EQ) { ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_eq, - SA_INTERRUPT, "ehca_eq", + IRQF_DISABLED, "ehca_eq", (void *)shca); if (ret < 0) ehca_err(ib_dev, "Can't map interrupt handler."); @@ -130,7 +130,7 @@ int ehca_create_eq(struct ehca_shca *shc tasklet_init(&eq->interrupt_task, ehca_tasklet_eq, (long)shca); } else if (type == EHCA_NEQ) { ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_neq, - SA_INTERRUPT, "ehca_neq", + IRQF_DISABLED, "ehca_neq", (void *)shca); if (ret < 0) ehca_err(ib_dev, "Can't map interrupt handler."); diff -puN drivers/misc/tifm_7xx1.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/misc/tifm_7xx1.c --- a/drivers/misc/tifm_7xx1.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/misc/tifm_7xx1.c @@ -367,7 +367,7 @@ static int tifm_7xx1_probe(struct pci_de if (!fm->addr) goto err_out_free; - rc = request_irq(dev->irq, tifm_7xx1_isr, SA_SHIRQ, DRIVER_NAME, fm); + rc = request_irq(dev->irq, tifm_7xx1_isr, IRQF_SHARED, DRIVER_NAME, fm); if (rc) goto err_out_unmap; diff -puN drivers/net/7990.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/net/7990.c --- a/drivers/net/7990.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/net/7990.c @@ -500,7 +500,7 @@ int lance_open (struct net_device *dev) int res; /* Install the Interrupt handler. Or we could shunt this out to specific drivers? */ - if (request_irq(lp->irq, lance_interrupt, SA_SHIRQ, lp->name, dev)) + if (request_irq(lp->irq, lance_interrupt, IRQF_SHARED, lp->name, dev)) return -EAGAIN; res = lance_reset(dev); diff -puN drivers/net/ehea/ehea_main.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/net/ehea/ehea_main.c --- a/drivers/net/ehea/ehea_main.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/net/ehea/ehea_main.c @@ -882,7 +882,7 @@ static int ehea_reg_interrupts(struct ne , "%s-recv%d", dev->name, i); ret = ibmebus_request_irq(NULL, pr->recv_eq->attr.ist1, ehea_recv_irq_handler, - SA_INTERRUPT, pr->int_recv_name, pr); + IRQF_DISABLED, pr->int_recv_name, pr); if (ret) { ehea_error("failed registering irq for ehea_recv_int:" "port_res_nr:%d, ist=%X", i, @@ -899,7 +899,7 @@ static int ehea_reg_interrupts(struct ne ret = ibmebus_request_irq(NULL, port->qp_eq->attr.ist1, ehea_qp_aff_irq_handler, - SA_INTERRUPT, port->int_aff_name, port); + IRQF_DISABLED, port->int_aff_name, port); if (ret) { ehea_error("failed registering irq for qp_aff_irq_handler:" "ist=%X", port->qp_eq->attr.ist1); @@ -916,7 +916,7 @@ static int ehea_reg_interrupts(struct ne "%s-send%d", dev->name, i); ret = ibmebus_request_irq(NULL, pr->send_eq->attr.ist1, ehea_send_irq_handler, - SA_INTERRUPT, pr->int_send_name, + IRQF_DISABLED, pr->int_send_name, pr); if (ret) { ehea_error("failed registering irq for ehea_send " @@ -2523,7 +2523,7 @@ static int __devinit ehea_probe(struct i (unsigned long)adapter); ret = ibmebus_request_irq(NULL, adapter->neq->attr.ist1, - ehea_interrupt_neq, SA_INTERRUPT, + ehea_interrupt_neq, IRQF_DISABLED, "ehea_neq", adapter); if (ret) { dev_err(&dev->ofdev.dev, "requesting NEQ IRQ failed"); diff -puN drivers/net/macb.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/net/macb.c --- a/drivers/net/macb.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/net/macb.c @@ -1068,7 +1068,7 @@ static int __devinit macb_probe(struct p } dev->irq = platform_get_irq(pdev, 0); - err = request_irq(dev->irq, macb_interrupt, SA_SAMPLE_RANDOM, + err = request_irq(dev->irq, macb_interrupt, IRQF_SAMPLE_RANDOM, dev->name, dev); if (err) { printk(KERN_ERR diff -puN drivers/net/netxen/netxen_nic_main.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/net/netxen/netxen_nic_main.c --- a/drivers/net/netxen/netxen_nic_main.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/net/netxen/netxen_nic_main.c @@ -619,8 +619,8 @@ static int netxen_nic_open(struct net_de } adapter->irq = adapter->ahw.pdev->irq; err = request_irq(adapter->ahw.pdev->irq, &netxen_intr, - SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name, - adapter); + IRQF_SHARED | IRQF_SAMPLE_RANDOM, + netdev->name, adapter); if (err) { printk(KERN_ERR "request_irq failed with: %d\n", err); netxen_free_hw_resources(adapter); diff -puN drivers/net/qla3xxx.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/net/qla3xxx.c --- a/drivers/net/qla3xxx.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/net/qla3xxx.c @@ -3080,7 +3080,7 @@ static int ql_adapter_up(struct ql3_adap { struct net_device *ndev = qdev->ndev; int err; - unsigned long irq_flags = SA_SAMPLE_RANDOM | SA_SHIRQ; + unsigned long irq_flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED; unsigned long flags; if (ql_alloc_mem_resources(qdev)) { @@ -3099,7 +3099,7 @@ static int ql_adapter_up(struct ql3_adap } else { printk(KERN_INFO PFX "%s: MSI Enabled...\n", qdev->ndev->name); set_bit(QL_MSI_ENABLED, &qdev->flags); - irq_flags &= ~SA_SHIRQ; + irq_flags &= ~IRQF_SHARED; } } diff -puN drivers/net/ucc_geth.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/net/ucc_geth.c --- a/drivers/net/ucc_geth.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/net/ucc_geth.c @@ -4000,8 +4000,8 @@ static void ugeth_phy_startup_timer(unsi /* Grab the PHY interrupt, if necessary/possible */ if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) { if (request_irq(ugeth->ug_info->phy_interrupt, - phy_interrupt, - SA_SHIRQ, "phy_interrupt", mii_info->dev) < 0) { + phy_interrupt, IRQF_SHARED, + "phy_interrupt", mii_info->dev) < 0) { ugeth_err("%s: Can't get IRQ %d (PHY)", mii_info->dev->name, ugeth->ug_info->phy_interrupt); diff -puN drivers/pci/pcie/aer/aerdrv.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/pci/pcie/aer/aerdrv.c --- a/drivers/pci/pcie/aer/aerdrv.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/pci/pcie/aer/aerdrv.c @@ -220,7 +220,7 @@ static int __devinit aer_probe (struct p } /* Request IRQ ISR */ - if ((status = request_irq(dev->irq, aer_irq, SA_SHIRQ, "aerdrv", + if ((status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", dev))) { printk(KERN_DEBUG "%s: Request ISR fails on PCIE device[%s]\n", __FUNCTION__, device->bus_id); diff -puN drivers/rtc/rtc-omap.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/rtc/rtc-omap.c --- a/drivers/rtc/rtc-omap.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/rtc/rtc-omap.c @@ -417,13 +417,13 @@ static int __devinit omap_rtc_probe(stru rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); /* handle periodic and alarm irqs */ - if (request_irq(omap_rtc_timer, rtc_irq, SA_INTERRUPT, + if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED, rtc->class_dev.class_id, &rtc->class_dev)) { pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", pdev->name, omap_rtc_timer); goto fail0; } - if (request_irq(omap_rtc_alarm, rtc_irq, SA_INTERRUPT, + if (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED, rtc->class_dev.class_id, &rtc->class_dev)) { pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", pdev->name, omap_rtc_alarm); diff -puN drivers/rtc/rtc-s3c.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/rtc/rtc-s3c.c --- a/drivers/rtc/rtc-s3c.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/rtc/rtc-s3c.c @@ -350,7 +350,7 @@ static int s3c_rtc_open(struct device *d int ret; ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, - SA_INTERRUPT, "s3c2410-rtc alarm", rtc_dev); + IRQF_DISABLED, "s3c2410-rtc alarm", rtc_dev); if (ret) { dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); @@ -358,7 +358,7 @@ static int s3c_rtc_open(struct device *d } ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, - SA_INTERRUPT, "s3c2410-rtc tick", rtc_dev); + IRQF_DISABLED, "s3c2410-rtc tick", rtc_dev); if (ret) { dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); diff -puN drivers/scsi/aic94xx/aic94xx_init.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/scsi/aic94xx/aic94xx_init.c --- a/drivers/scsi/aic94xx/aic94xx_init.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/scsi/aic94xx/aic94xx_init.c @@ -651,7 +651,7 @@ static int __devinit asd_pci_probe(struc if (use_msi) pci_enable_msi(asd_ha->pcidev); - err = request_irq(asd_ha->pcidev->irq, asd_hw_isr, SA_SHIRQ, + err = request_irq(asd_ha->pcidev->irq, asd_hw_isr, IRQF_SHARED, ASD_DRIVER_NAME, asd_ha); if (err) { asd_printk("couldn't get irq %d for %s\n", diff -puN drivers/scsi/arcmsr/arcmsr_hba.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/scsi/arcmsr/arcmsr_hba.c --- a/drivers/scsi/arcmsr/arcmsr_hba.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/scsi/arcmsr/arcmsr_hba.c @@ -322,7 +322,7 @@ static int arcmsr_probe(struct pci_dev * goto out_iounmap; error = request_irq(pdev->irq, arcmsr_do_interrupt, - SA_INTERRUPT | SA_SHIRQ, "arcmsr", acb); + IRQF_DISABLED | IRQF_SHARED, "arcmsr", acb); if (error) goto out_free_ccb_pool; diff -puN drivers/scsi/ibmvscsi/ibmvstgt.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/scsi/ibmvscsi/ibmvstgt.c --- a/drivers/scsi/ibmvscsi/ibmvstgt.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/scsi/ibmvscsi/ibmvstgt.c @@ -580,7 +580,7 @@ static int crq_queue_create(struct crq_q } err = request_irq(vport->dma_dev->irq, &ibmvstgt_interrupt, - SA_INTERRUPT, "ibmvstgt", target); + IRQF_DISABLED, "ibmvstgt", target); if (err) goto req_irq_failed; diff -puN drivers/scsi/qla4xxx/ql4_os.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/scsi/qla4xxx/ql4_os.c --- a/drivers/scsi/qla4xxx/ql4_os.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/scsi/qla4xxx/ql4_os.c @@ -1256,7 +1256,7 @@ static int __devinit qla4xxx_probe_adapt INIT_WORK(&ha->dpc_work, qla4xxx_do_dpc); ret = request_irq(pdev->irq, qla4xxx_intr_handler, - SA_INTERRUPT|SA_SHIRQ, "qla4xxx", ha); + IRQF_DISABLED | IRQF_SHARED, "qla4xxx", ha); if (ret) { dev_warn(&ha->pdev->dev, "Failed to reserve interrupt %d" " already in use.\n", pdev->irq); diff -puN drivers/usb/gadget/pxa2xx_udc.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/usb/gadget/pxa2xx_udc.c --- a/drivers/usb/gadget/pxa2xx_udc.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/usb/gadget/pxa2xx_udc.c @@ -2613,7 +2613,7 @@ lubbock_fail0: #endif if (vbus_irq) { retval = request_irq(vbus_irq, udc_vbus_irq, - SA_INTERRUPT | SA_SAMPLE_RANDOM, + IRQF_DISABLED | IRQF_SAMPLE_RANDOM, driver_name, dev); if (retval != 0) { printk(KERN_ERR "%s: can't get irq %i, err %d\n", diff -puN drivers/usb/host/ohci-ep93xx.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/usb/host/ohci-ep93xx.c --- a/drivers/usb/host/ohci-ep93xx.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/usb/host/ohci-ep93xx.c @@ -78,7 +78,7 @@ static int usb_hcd_ep93xx_probe(const st ohci_hcd_init(hcd_to_ohci(hcd)); - retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); + retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED); if (retval == 0) return retval; diff -puN drivers/usb/host/ohci-pnx4008.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/usb/host/ohci-pnx4008.c --- a/drivers/usb/host/ohci-pnx4008.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/usb/host/ohci-pnx4008.c @@ -421,7 +421,7 @@ static int __devinit usb_hcd_pnx4008_pro ohci_hcd_init(ohci); dev_info(&pdev->dev, "at 0x%p, irq %d\n", hcd->regs, hcd->irq); - ret = usb_add_hcd(hcd, irq, SA_INTERRUPT); + ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); if (ret == 0) return ret; diff -puN drivers/usb/host/ohci-pnx8550.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/usb/host/ohci-pnx8550.c --- a/drivers/usb/host/ohci-pnx8550.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/usb/host/ohci-pnx8550.c @@ -107,7 +107,7 @@ int usb_hcd_pnx8550_probe (const struct ohci_hcd_init(hcd_to_ohci(hcd)); - retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT); + retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); if (retval == 0) return retval; diff -puN drivers/video/intelfb/intelfbhw.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups drivers/video/intelfb/intelfbhw.c --- a/drivers/video/intelfb/intelfbhw.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/drivers/video/intelfb/intelfbhw.c @@ -1990,7 +1990,8 @@ int intelfbhw_enable_irq(struct intelfb_info *dinfo, int reenable) { if (!test_and_set_bit(0, &dinfo->irq_flags)) { - if (request_irq(dinfo->pdev->irq, intelfbhw_irq, SA_SHIRQ, "intelfb", dinfo)) { + if (request_irq(dinfo->pdev->irq, intelfbhw_irq, IRQF_SHARED, + "intelfb", dinfo)) { clear_bit(0, &dinfo->irq_flags); return -EINVAL; } diff -puN kernel/irq/manage.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups kernel/irq/manage.c --- a/kernel/irq/manage.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups +++ a/kernel/irq/manage.c @@ -489,7 +489,7 @@ int request_irq(unsigned int irq, irq_ha /* * Lockdep wants atomic interrupt handlers: */ - irqflags |= SA_INTERRUPT; + irqflags |= IRQF_DISABLED; #endif /* * Sanity-check: shared interrupts must pass in a real dev-ID, _