From: Thomas Gleixner The obsolete SA_xxx interrupt flags have been used despite the scheduled removal. Fixup the remaining users in -mm. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton --- arch/i386/kernel/vmitime.c | 10 ++++------ drivers/char/nozomi.c | 2 +- drivers/firewire/fw-ohci.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff -puN arch/i386/kernel/vmitime.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-3 arch/i386/kernel/vmitime.c --- a/arch/i386/kernel/vmitime.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-3 +++ a/arch/i386/kernel/vmitime.c @@ -123,12 +123,10 @@ static struct clocksource clocksource_vm static irqreturn_t vmi_timer_interrupt(int irq, void *dev_id); static struct irqaction vmi_timer_irq = { - vmi_timer_interrupt, - SA_INTERRUPT, - CPU_MASK_NONE, - "VMI-alarm", - NULL, - NULL + .handler = vmi_timer_interrupt, + .flags = IRQF_DISABLED, + .mask = CPU_MASK_NONE, + .name = "VMI-alarm", }; /* Alarm rate */ diff -puN drivers/char/nozomi.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-3 drivers/char/nozomi.c --- a/drivers/char/nozomi.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-3 +++ a/drivers/char/nozomi.c @@ -1378,7 +1378,7 @@ static int nozomi_setup_interrupt(struct { int rval; - rval = request_irq(dc->pdev->irq, &interrupt_handler, SA_SHIRQ, + rval = request_irq(dc->pdev->irq, &interrupt_handler, IRQF_SHARED, NOZOMI_NAME, dc); if (rval) dev_err(&dc->pdev->dev, "Cannot open because IRQ %d " diff -puN drivers/firewire/fw-ohci.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-3 drivers/firewire/fw-ohci.c --- a/drivers/firewire/fw-ohci.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-3 +++ a/drivers/firewire/fw-ohci.c @@ -909,7 +909,7 @@ static int ohci_enable(struct fw_card *c reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); if (request_irq(dev->irq, irq_handler, - SA_SHIRQ, ohci_driver_name, ohci)) { + IRQF_SHARED, ohci_driver_name, ohci)) { fw_error("Failed to allocate shared interrupt %d.\n", dev->irq); dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE, _