irq: remove IRQF_DISABLED
Subsystems (89)
RFC PATCH 1/1 irq: remove IRQF_DISABLED
Hi Linus,
Would you be willing to take such a patch?
Its a rather big one, but if you think its a good idea, I can generate one against whatever tree is needed.
Provided I didn't break any !genirq stuff.. then again, that might be a nice incentive to fix up those last few archs.
---
Subject: irq: remove IRQF_DISABLED
From: Peter Zijlstra <[email protected]>
Date: Mon Mar 02 10:45:53 CET 2009
People are playing odd games with IRQF_DISABLED, remove it.
Its not reliable, since shared interrupt lines could disable it for you, and its possible and allowed for archs to disable IRQs to limit IRQ nesting.
Therefore, simply mandate that _ALL_ IRQ handlers are run with IRQs disabled.
[ This _should_ not break anything, since we've mandated that IRQ handlers
_must_ be able to deal with this for a _long_ time ]
IRQ handlers should be fast, no if buts and any other exceptions. We also have plenty instrumentation to find any offending IRQ latency sources.
--- Documentation/scsi/ChangeLog.ncr53c8xx | 2 - Documentation/scsi/tmscsim.txt | 2 - arch/alpha/include/asm/floppy.h | 2 - arch/alpha/kernel/irq.c | 8 +--- arch/alpha/kernel/irq_alpha.c | 2 - arch/alpha/kernel/sys_jensen.c | 7 --- arch/alpha/kernel/sys_titan.c | 14 +++---- arch/arm/common/time-acorn.c | 2 - arch/arm/include/asm/floppy.h | 2 - arch/arm/mach-aaec2000/core.c | 2 - arch/arm/mach-at91/at91rm9200_time.c | 2 - arch/arm/mach-at91/at91sam926x_time.c | 2 - arch/arm/mach-at91/at91x40_time.c | 2 - arch/arm/mach-clps711x/time.c | 2 - arch/arm/mach-davinci/time.c | 4 +- arch/arm/mach-ebsa110/core.c | 2 - arch/arm/mach-ep93xx/core.c | 2 - arch/arm/mach-footbridge/dc21285-timer.c | 2 - arch/arm/mach-footbridge/dc21285.c | 10 ++--- arch/arm/mach-footbridge/isa-timer.c | 2 - arch/arm/mach-h720x/cpu-h7201.c | 2 - arch/arm/mach-h720x/cpu-h7202.c | 2 - arch/arm/mach-imx/time.c | 2 - arch/arm/mach-integrator/core.c | 2 - arch/arm/mach-ixp2000/core.c | 2 - arch/arm/mach-ixp23xx/core.c | 2 - arch/arm/mach-ixp4xx/common.c | 2 - arch/arm/mach-ixp4xx/dsmg600-setup.c | 2 - arch/arm/mach-ixp4xx/fsg-setup.c | 4 +- arch/arm/mach-ixp4xx/nas100d-setup.c | 2 - arch/arm/mach-ixp4xx/nslu2-setup.c | 4 +- arch/arm/mach-ks8695/time.c | 2 - arch/arm/mach-lh7a40x/time.c | 2 - arch/arm/mach-msm/timer.c | 4 +- arch/arm/mach-netx/time.c | 2 - arch/arm/mach-ns9xxx/time-ns9360.c | 2 - arch/arm/mach-omap1/pm.c | 2 - arch/arm/mach-omap1/time.c | 4 +- arch/arm/mach-omap1/timer32k.c | 2 - arch/arm/mach-omap2/timer-gp.c | 2 - arch/arm/mach-pnx4008/time.c | 2 - arch/arm/mach-pxa/am200epd.c | 2 - arch/arm/mach-pxa/cm-x270.c | 2 - arch/arm/mach-pxa/corgi.c | 2 - arch/arm/mach-pxa/dma.c | 2 - arch/arm/mach-pxa/em-x270.c | 2 - arch/arm/mach-pxa/magician.c | 2 - arch/arm/mach-pxa/mainstone.c | 2 - arch/arm/mach-pxa/mioa701.c | 2 - arch/arm/mach-pxa/palmtx.c | 2 - arch/arm/mach-pxa/palmz72.c | 2 - arch/arm/mach-pxa/pcm990-baseboard.c | 2 - arch/arm/mach-pxa/poodle.c | 2 - arch/arm/mach-pxa/sharpsl_pm.c | 8 ++-- arch/arm/mach-pxa/spitz.c | 2 - arch/arm/mach-pxa/time.c | 2 - arch/arm/mach-pxa/tosa.c | 2 - arch/arm/mach-pxa/trizeps4.c | 2 - arch/arm/mach-realview/core.c | 2 - arch/arm/mach-rpc/dma.c | 2 - arch/arm/mach-s3c2410/usb-simtec.c | 2 - arch/arm/mach-sa1100/collie_pm.c | 4 +- arch/arm/mach-sa1100/dma.c | 2 - arch/arm/mach-sa1100/h3600.c | 2 - arch/arm/mach-sa1100/time.c | 2 - arch/arm/mach-shark/core.c | 2 - arch/arm/mach-versatile/core.c | 2 - arch/arm/mach-w90x900/time.c | 2 - arch/arm/oprofile/op_model_arm11_core.c | 2 - arch/arm/oprofile/op_model_mpcore.c | 2 - arch/arm/oprofile/op_model_v7.c | 2 - arch/arm/oprofile/op_model_xscale.c | 2 - arch/arm/plat-iop/time.c | 2 - arch/arm/plat-mxc/time.c | 2 - arch/arm/plat-omap/dma.c | 2 - arch/arm/plat-omap/mailbox.c | 2 - arch/arm/plat-orion/time.c | 2 - arch/arm/plat-s3c/time.c | 2 - arch/arm/plat-s3c24xx/dma.c | 2 - arch/avr32/kernel/time.c | 2 - arch/blackfin/kernel/bfin_dma_5xx.c | 2 - arch/blackfin/kernel/time-ts.c | 2 - arch/blackfin/kernel/time.c | 4 +- arch/blackfin/mach-bf537/boards/cm_bf537.c | 2 - arch/blackfin/mach-bf537/boards/stamp.c | 2 - arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 - arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 - arch/blackfin/mach-bf561/smp.c | 2 - arch/cris/arch-v10/drivers/gpio.c | 4 +- arch/cris/arch-v10/drivers/sync_serial.c | 4 +- arch/cris/arch-v10/kernel/time.c | 2 - arch/cris/arch-v32/drivers/mach-a3/gpio.c | 2 - arch/cris/arch-v32/drivers/mach-fs/gpio.c | 4 +- arch/cris/arch-v32/kernel/fasttimer.c | 2 - arch/cris/arch-v32/kernel/smp.c | 2 - arch/cris/arch-v32/kernel/time.c | 2 - arch/cris/arch-v32/mach-a3/arbiter.c | 4 +- arch/cris/arch-v32/mach-fs/arbiter.c | 2 - arch/frv/kernel/irq-mb93091.c | 8 ++-- arch/frv/kernel/irq-mb93093.c | 2 - arch/frv/kernel/irq-mb93493.c | 4 +- arch/frv/kernel/time.c | 2 - arch/h8300/kernel/timer/itu.c | 2 - arch/h8300/kernel/timer/timer16.c | 2 - arch/h8300/kernel/timer/timer8.c | 2 - arch/h8300/kernel/timer/tpu.c | 2 - arch/ia64/hp/sim/simserial.c | 2 - arch/ia64/kernel/irq_ia64.c | 8 ++-- arch/ia64/kernel/mca.c | 12 +++--- arch/ia64/kernel/perfmon.c | 2 - arch/ia64/kernel/time.c | 2 - arch/ia64/xen/irq_xen.c | 6 +-- arch/m32r/kernel/time.c | 2 - arch/m68k/include/asm/floppy.h | 2 - arch/m68k/include/asm/sun3xflop.h | 2 - arch/m68knommu/platform/68328/timers.c | 2 - arch/m68knommu/platform/68360/config.c | 2 - arch/m68knommu/platform/coldfire/pit.c | 2 - arch/m68knommu/platform/coldfire/timers.c | 4 +- arch/mips/alchemy/common/dbdma.c | 2 - arch/mips/alchemy/common/time.c | 2 - arch/mips/basler/excite/excite_iodev.c | 2 - arch/mips/dec/setup.c | 2 - arch/mips/include/asm/mach-generic/floppy.h | 2 - arch/mips/include/asm/mach-jazz/floppy.h | 2 - arch/mips/jazz/irq.c | 2 - arch/mips/kernel/cevt-bcm1480.c | 2 - arch/mips/kernel/cevt-ds1287.c | 2 - arch/mips/kernel/cevt-gt641xx.c | 2 - arch/mips/kernel/cevt-r4k.c | 2 - arch/mips/kernel/cevt-sb1250.c | 2 - arch/mips/kernel/cevt-txx9.c | 2 - arch/mips/kernel/i8253.c | 2 - arch/mips/kernel/rtlx.c | 2 - arch/mips/kernel/smtc.c | 2 - arch/mips/mti-malta/malta-int.c | 4 +- arch/mips/nxp/pnx8550/common/int.c | 4 +- arch/mips/nxp/pnx8550/common/time.c | 4 +- arch/mips/pci/ops-pmcmsp.c | 2 - arch/mips/pci/ops-tx3927.c | 2 - arch/mips/pci/pci-tx4927.c | 2 - arch/mips/pci/pci-tx4938.c | 2 - arch/mips/pci/pci-tx4939.c | 2 - arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 - arch/mips/sgi-ip22/ip22-int.c | 10 ++--- arch/mips/sgi-ip27/ip27-timer.c | 2 - arch/mips/sgi-ip32/ip32-irq.c | 4 +- arch/mips/sni/irq.c | 2 - arch/mips/sni/time.c | 2 - arch/mips/txx9/generic/pci.c | 2 - arch/mn10300/kernel/mn10300-serial.c | 6 +-- arch/mn10300/kernel/time.c | 2 - arch/parisc/include/asm/floppy.h | 4 +- arch/parisc/kernel/irq.c | 4 +- arch/powerpc/include/asm/floppy.h | 4 +- arch/powerpc/kernel/smp.c | 2 - arch/powerpc/platforms/cell/beat.c | 2 - arch/powerpc/platforms/cell/celleb_scc_pciex.c | 2 - arch/powerpc/platforms/cell/interrupt.c | 2 - arch/powerpc/platforms/cell/iommu.c | 2 - arch/powerpc/platforms/cell/pmu.c | 2 - arch/powerpc/platforms/cell/spu_base.c | 6 +-- arch/powerpc/platforms/powermac/pic.c | 2 - arch/powerpc/platforms/powermac/smp.c | 2 - arch/powerpc/platforms/ps3/device-init.c | 2 - arch/powerpc/platforms/ps3/smp.c | 2 - arch/powerpc/platforms/pseries/xics.c | 4 +- arch/powerpc/sysdev/ppc4xx_soc.c | 2 - arch/sh/boards/mach-cayman/irq.c | 4 +- arch/sh/boards/mach-hp6xx/hp6xx_apm.c | 2 - arch/sh/boards/mach-snapgear/setup.c | 2 - arch/sh/drivers/dma/dma-g2.c | 2 - arch/sh/drivers/dma/dma-pvr2.c | 2 - arch/sh/drivers/dma/dma-sh.c | 4 +- arch/sh/drivers/dma/dmabrg.c | 6 +-- arch/sh/drivers/pci/pci-sh5.c | 4 +- arch/sh/drivers/push-switch.c | 2 - arch/sh/kernel/cpu/sh4a/smp-shx3.c | 2 - arch/sh/kernel/time_64.c | 2 - arch/sh/kernel/timers/timer-cmt.c | 2 - arch/sh/kernel/timers/timer-mtu2.c | 2 - arch/sh/kernel/timers/timer-tmu.c | 2 - arch/sparc/include/asm/floppy_32.h | 2 - arch/sparc/include/asm/floppy_64.h | 2 - arch/sparc/kernel/irq_32.c | 13 +----- arch/sparc/kernel/pcic.c | 2 - arch/sparc/kernel/sun4c_irq.c | 2 - arch/sparc/kernel/sun4d_irq.c | 15 +------ arch/sparc/kernel/sun4m_irq.c | 2 - arch/um/drivers/line.c | 4 +- arch/um/drivers/mconsole_kern.c | 2 - arch/um/drivers/net_kern.c | 2 - arch/um/drivers/port_kern.c | 4 +- arch/um/drivers/random.c | 2 - arch/um/drivers/ubd_kern.c | 2 - arch/um/drivers/xterm_kern.c | 2 - arch/um/kernel/sigio.c | 2 - arch/um/kernel/time.c | 2 - arch/x86/include/asm/floppy.h | 4 +- arch/x86/kernel/hpet.c | 2 - arch/x86/kernel/mfgpt_32.c | 2 - arch/x86/kernel/setup.c | 2 - arch/x86/kernel/time_64.c | 2 - arch/x86/kernel/vmiclock_32.c | 2 - arch/x86/xen/smp.c | 8 ++-- arch/x86/xen/spinlock.c | 2 - arch/x86/xen/time.c | 2 - arch/xtensa/kernel/time.c | 2 - drivers/ata/pata_mpc52xx.c | 2 - drivers/atm/he.c | 2 - drivers/atm/idt77252.c | 2 - drivers/atm/nicstar.c | 2 - drivers/atm/solos-pci.c | 2 - drivers/block/cciss.c | 2 - drivers/block/cpqarray.c | 2 - drivers/block/hd.c | 2 - drivers/cdrom/gdrom.c | 4 +- drivers/char/amiserial.c | 2 - drivers/char/cyclades.c | 2 - drivers/char/hpet.c | 3 - drivers/char/hvc_irq.c | 2 - drivers/char/hvcs.c | 2 - drivers/char/hvsi.c | 2 - drivers/char/ipmi/ipmi_si_intf.c | 4 +- drivers/char/isicom.c | 2 - drivers/char/nwbutton.c | 2 - drivers/char/riscom8.c | 2 - drivers/char/rtc.c | 2 - drivers/char/snsc.c | 2 - drivers/char/snsc_event.c | 2 - drivers/char/specialix.c | 4 +- drivers/char/sx.c | 4 +- drivers/char/tlclk.c | 2 - drivers/char/vme_scc.c | 48 ++++++++++++------------- drivers/clocksource/tcb_clksrc.c | 2 - drivers/edac/mpc85xx_edac.c | 6 +-- drivers/edac/mv64x60_edac.c | 8 ++-- drivers/i2c/busses/i2c-bfin-twi.c | 4 +- drivers/i2c/busses/i2c-highlander.c | 2 - drivers/i2c/busses/i2c-pmcmsp.c | 2 - drivers/i2c/busses/i2c-pxa.c | 2 - drivers/i2c/busses/i2c-s3c2410.c | 2 - drivers/i2c/busses/i2c-sh7760.c | 2 - drivers/i2c/busses/i2c-sh_mobile.c | 2 - drivers/infiniband/hw/ehca/ehca_eq.c | 4 +- drivers/input/keyboard/corgikbd.c | 2 - drivers/input/keyboard/jornada720_kbd.c | 2 - drivers/input/keyboard/pxa27x_keypad.c | 2 - drivers/input/keyboard/pxa930_rotary.c | 2 - drivers/input/keyboard/spitzkbd.c | 12 +++--- drivers/input/keyboard/tosakbd.c | 2 - drivers/input/misc/ixp4xx-beeper.c | 2 - drivers/input/mouse/pxa930_trkball.c | 2 - drivers/input/touchscreen/atmel_tsadcc.c | 2 - drivers/input/touchscreen/corgi_ts.c | 2 - drivers/input/touchscreen/h3600_ts_input.c | 4 +- drivers/input/touchscreen/hp680_ts_input.c | 2 - drivers/input/touchscreen/jornada720_ts.c | 2 - drivers/isdn/hardware/eicon/divasmain.c | 2 - drivers/isdn/sc/init.c | 2 - drivers/media/common/saa7146_core.c | 2 - drivers/media/dvb/bt8xx/bt878.c | 2 - drivers/media/video/bt8xx/bttv-driver.c | 2 - drivers/media/video/cx18/cx18-driver.c | 2 - drivers/media/video/cx23885/cx23885-core.c | 2 - drivers/media/video/cx88/cx88-alsa.c | 2 - drivers/media/video/cx88/cx88-mpeg.c | 2 - drivers/media/video/cx88/cx88-video.c | 2 - drivers/media/video/ivtv/ivtv-driver.c | 2 - drivers/media/video/meye.c | 2 - drivers/media/video/saa7134/saa7134-alsa.c | 2 - drivers/media/video/saa7134/saa7134-core.c | 2 - drivers/media/video/sh_mobile_ceu_camera.c | 2 - drivers/media/video/stradis.c | 2 - drivers/media/video/zoran/zoran_card.c | 2 - drivers/mfd/da903x.c | 2 - drivers/mfd/menelaus.c | 2 - drivers/misc/phantom.c | 2 - drivers/mmc/host/omap_hsmmc.c | 4 +- drivers/mmc/host/tmio_mmc.c | 2 - drivers/mtd/nand/pxa3xx_nand.c | 2 - drivers/mtd/nand/tmio_nand.c | 2 - drivers/net/bfin_mac.c | 2 - drivers/net/ehea/ehea_main.c | 6 +-- drivers/net/fec.c | 8 ++-- drivers/net/hamradio/baycom_ser_fdx.c | 2 - drivers/net/hamradio/baycom_ser_hdx.c | 2 - drivers/net/hamradio/scc.c | 2 - drivers/net/hamradio/yam.c | 2 - drivers/net/hp100.c | 2 - drivers/net/irda/donauboe.c | 4 +- drivers/net/jazzsonic.c | 2 - drivers/net/korina.c | 8 ++-- drivers/net/pasemi_mac.c | 4 +- drivers/net/ps3_gelic_net.c | 2 - drivers/net/smsc911x.c | 2 - drivers/net/smsc9420.c | 2 - drivers/net/sun3lance.c | 2 - drivers/net/tulip/de4x5.c | 2 - drivers/net/wan/hostess_sv11.c | 2 - drivers/net/wan/sealevel.c | 2 - drivers/net/xtsonic.c | 2 - drivers/parisc/superio.c | 2 - drivers/pcmcia/soc_common.c | 2 - drivers/pnp/resource.c | 2 - drivers/ps3/ps3-vuart.c | 2 - drivers/ps3/ps3stor_lib.c | 2 - drivers/rtc/rtc-at91rm9200.c | 2 - drivers/rtc/rtc-at91sam9.c | 2 - drivers/rtc/rtc-cmos.c | 2 - drivers/rtc/rtc-ds1511.c | 2 - drivers/rtc/rtc-ds1553.c | 2 - drivers/rtc/rtc-omap.c | 4 +- drivers/rtc/rtc-pl030.c | 2 - drivers/rtc/rtc-pl031.c | 2 - drivers/rtc/rtc-pxa.c | 4 +- drivers/rtc/rtc-s3c.c | 4 +- drivers/rtc/rtc-sa1100.c | 6 +-- drivers/rtc/rtc-sh.c | 6 +-- drivers/rtc/rtc-stk17ta8.c | 2 - drivers/rtc/rtc-tx4939.c | 2 - drivers/rtc/rtc-vr41xx.c | 4 +- drivers/scsi/NCR5380.c | 2 - drivers/scsi/aacraid/rx.c | 2 - drivers/scsi/aacraid/sa.c | 2 - drivers/scsi/aha152x.c | 4 +- drivers/scsi/aic7xxx_old.c | 2 - drivers/scsi/arm/acornscsi.c | 2 - drivers/scsi/arm/cumana_1.c | 2 - drivers/scsi/arm/cumana_2.c | 2 - drivers/scsi/arm/powertec.c | 2 - drivers/scsi/dtc.c | 2 - drivers/scsi/eata.c | 2 - drivers/scsi/eata_pio.c | 4 +- drivers/scsi/g_NCR5380.c | 2 - drivers/scsi/gdth.c | 6 +-- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 - drivers/scsi/in2000.c | 2 - drivers/scsi/initio.c | 2 - drivers/scsi/pas16.c | 2 - drivers/scsi/qla1280.c | 2 - drivers/scsi/qla2xxx/qla_isr.c | 2 - drivers/scsi/qla4xxx/ql4_os.c | 2 - drivers/scsi/t128.c | 2 - drivers/scsi/u14-34f.c | 2 - drivers/scsi/wd7000.c | 2 - drivers/serial/68328serial.c | 2 - drivers/serial/bfin_5xx.c | 4 +- drivers/serial/crisv10.c | 18 ++++----- drivers/serial/icom.c | 2 - drivers/serial/jsm/jsm_driver.c | 2 - drivers/serial/mcf.c | 2 - drivers/serial/mpc52xx_uart.c | 2 - drivers/serial/serial_ks8695.c | 8 ++-- drivers/serial/sh-sci.c | 4 +- drivers/serial/sn_console.c | 2 - drivers/serial/uartlite.c | 2 - drivers/spi/spi_imx.c | 2 - drivers/staging/me4000/me4000.c | 6 +-- drivers/staging/meilhaus/me0600_ext_irq.c | 6 --- drivers/staging/meilhaus/me1400_ext_irq.c | 6 --- drivers/staging/meilhaus/me4600_ai.c | 6 --- drivers/staging/meilhaus/me4600_ao.c | 6 --- drivers/staging/meilhaus/me4600_ext_irq.c | 6 --- drivers/staging/meilhaus/me6000_ao.c | 6 --- drivers/staging/meilhaus/me8100_di.c | 6 --- drivers/staging/meilhaus/me8200_di.c | 12 +----- drivers/staging/meilhaus/me8200_do.c | 6 --- drivers/uio/uio_cif.c | 2 - drivers/uio/uio_pdrv_genirq.c | 1 drivers/uio/uio_sercos3.c | 2 - drivers/usb/core/hcd-pci.c | 2 - drivers/usb/core/hcd.c | 7 --- drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/imx_udc.c | 2 - drivers/usb/gadget/lh7a40x_udc.c | 2 - drivers/usb/gadget/m66592-udc.c | 2 - drivers/usb/gadget/omap_udc.c | 2 - drivers/usb/gadget/pxa25x_udc.c | 8 ++-- drivers/usb/gadget/s3c2410_udc.c | 4 +- drivers/usb/host/ehci-au1xxx.c | 2 - drivers/usb/host/ehci-fsl.c | 2 - drivers/usb/host/ehci-orion.c | 2 - drivers/usb/host/ehci-ps3.c | 2 - drivers/usb/host/fhci-hcd.c | 4 +- drivers/usb/host/isp116x-hcd.c | 2 - drivers/usb/host/isp1760-if.c | 4 +- drivers/usb/host/ohci-at91.c | 2 - drivers/usb/host/ohci-au1xxx.c | 2 - drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-lh7a404.c | 2 - drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-pnx4008.c | 2 - drivers/usb/host/ohci-pnx8550.c | 2 - drivers/usb/host/ohci-ppc-of.c | 2 - drivers/usb/host/ohci-ppc-soc.c | 2 - drivers/usb/host/ohci-ps3.c | 2 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-s3c2410.c | 2 - drivers/usb/host/ohci-sa1111.c | 2 - drivers/usb/host/ohci-sh.c | 2 - drivers/usb/host/ohci-sm501.c | 2 - drivers/usb/host/ohci-ssb.c | 2 - drivers/usb/host/ohci-tmio.c | 2 - drivers/usb/host/r8a66597-hcd.c | 2 - drivers/usb/host/sl811-hcd.c | 2 - drivers/usb/musb/musbhsdma.c | 2 - drivers/usb/otg/isp1301_omap.c | 2 - drivers/video/au1200fb.c | 2 - drivers/video/bf54x-lq043fb.c | 2 - drivers/video/bfin-t350mcqb-fb.c | 2 - drivers/video/mb862xx/mb862xxfb.c | 4 +- drivers/video/ps3fb.c | 2 - drivers/video/pxafb.c | 2 - drivers/video/s3c2410fb.c | 2 - drivers/video/sa1100fb.c | 2 - drivers/video/sh_mobile_lcdcfb.c | 2 - drivers/video/tmiofb.c | 2 - drivers/w1/masters/ds1wm.c | 2 - drivers/w1/masters/omap_hdq.c | 2 - drivers/watchdog/eurotechwdt.c | 2 - drivers/watchdog/mpcore_wdt.c | 2 - drivers/watchdog/rm9k_wdt.c | 2 - drivers/watchdog/sb_wdog.c | 4 +- drivers/watchdog/wdt.c | 2 - drivers/watchdog/wdt_pci.c | 2 - include/linux/interrupt.h | 2 - include/net/irda/irda_device.h | 2 - include/sound/initval.h | 2 - kernel/irq/handle.c | 4 -- kernel/irq/manage.c | 20 ---------- sound/arm/aaci.c | 2 - sound/arm/pxa2xx-ac97-lib.c | 2 - sound/drivers/ml403-ac97cr.c | 4 +- sound/drivers/mpu401/mpu401.c | 3 - sound/drivers/mtpav.c | 2 - sound/drivers/serial-u16550.c | 2 - sound/isa/ad1816a/ad1816a.c | 2 - sound/isa/ad1816a/ad1816a_lib.c | 2 - sound/isa/als100.c | 2 - sound/isa/azt2320.c | 2 - sound/isa/cs423x/cs4231.c | 3 - sound/isa/cs423x/cs4236.c | 2 - sound/isa/dt019x.c | 3 - sound/isa/es1688/es1688.c | 2 - sound/isa/es1688/es1688_lib.c | 2 - sound/isa/es18xx.c | 2 - sound/isa/gus/gus_main.c | 2 - sound/isa/gus/gusextreme.c | 2 - sound/isa/gus/gusmax.c | 2 - sound/isa/gus/interwave.c | 2 - sound/isa/opl3sa2.c | 2 - sound/isa/opti9xx/miro.c | 2 - sound/isa/opti9xx/opti92x-ad1848.c | 4 +- sound/isa/sb/sb_common.c | 2 - sound/isa/sc6000.c | 2 - sound/isa/sgalaxy.c | 2 - sound/isa/sscape.c | 2 - sound/isa/wavefront/wavefront.c | 4 +- sound/isa/wss/wss_lib.c | 2 - sound/mips/au1x00.c | 4 +- sound/oss/sh_dac_audio.c | 2 - sound/pci/sis7019.c | 4 +- sound/ppc/snd_ps3.c | 2 - sound/soc/s3c24xx/s3c2443-ac97.c | 2 - sound/sparc/amd7930.c | 2 - 466 files changed, 623 insertions(+), 730 deletions(-)
Documentation/scsi/ChangeLog.ncr53c8xx +1 -1
@@ -196,7 +196,7 @@ Sun Feb 14:00 1999 Gerard Roudier (grou - Allow to tune request_irq() flags from the boot command line using ncr53c8xx=irqm:??, as follows: a) If bit 0x10 is set in irqm, IRQF_SHARED flag is not used. - b) If bit 0x20 is set in irqm, IRQF_DISABLED flag is not used. + b) If bit 0x20 is set in irqm, 0 flag is not used. By default the driver uses both IRQF_SHARED and IRQF_DISABLED. Option 'ncr53c8xx=irqm:0x20' may be used when an IRQ is shared by a 53C8XX adapter and a network board.
Documentation/scsi/tmscsim.txt +1 -1
@@ -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 -IRQF_SHARED | IRQF_DISABLED. +IRQF_SHARED . 3.Features
arch/alpha/include/asm/floppy.h +1 -1
@@ -26,7 +26,7 @@#define fd_disable_irq () disable_irq(FLOPPY_IRQ)#define fd_cacheflush (addr,size)/* nothing */ #define fd_request_irq () request_irq(FLOPPY_IRQ, floppy_interrupt,\ - IRQF_DISABLED, "floppy", NULL) + 0, "floppy", NULL)#define fd_free_irq () free_irq(FLOPPY_IRQ, NULL);#ifdef CONFIG_PCI
arch/alpha/kernel/irq.c +2 -6
@@ -93,14 +93,10 @@ show_interrupts(struct seq_file *p, voidseq_printf (p,"%10u " ,kstat_irqs_cpu (irq, j));#endif seq_printf (p," %14s" , irq_desc[irq].chip->typename); -seq_printf (p," %c%s" , - (action->flags &IRQF_DISABLED )?'+' :' ' , - action->name); +seq_printf (p," %c%s" ,'+' , action->name);for (action=action->next; action; action = action->next) { -seq_printf (p,", %c%s" , - (action->flags &IRQF_DISABLED )?'+' :' ' , - action->name); +seq_printf (p,", %c%s" ,'+' , action->name); }seq_putc (p,'\n' );
arch/alpha/kernel/irq_alpha.c +1 -1
@@ -223,7 +223,7 @@ static unsigned int rtc_startup(unsignedstruct irqaction timer_irqaction = { .handler = timer_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .name ="timer" , };
arch/alpha/kernel/sys_jensen.c +0 -7
@@ -68,13 +68,6 @@ jensen_local_startup(unsigned int irq)/* the parport is really hw IRQ 1, silly Jensen. */ if (irq ==7 )i8259a_startup_irq (1 ); -else -/* -* For all true local interrupts, set the flag that prevents -* the IPL from being dropped during handler processing. -*/ -if (irq_desc[irq].action) - irq_desc[irq].action->flags |=IRQF_DISABLED ;return 0 ; }
arch/alpha/kernel/sys_titan.c +7 -7
@@ -291,15 +291,15 @@ titan_late_init(void)* all reported to the kernel as machine checks, so the handler * is a nop so it can be called to count the individual events. */ -titan_request_irq (63 +16 , titan_intr_nop,IRQF_DISABLED , +titan_request_irq (63 +16 , titan_intr_nop,0 ,"CChip Error" ,NULL ); -titan_request_irq (62 +16 , titan_intr_nop,IRQF_DISABLED , +titan_request_irq (62 +16 , titan_intr_nop,0 ,"PChip 0 H_Error" ,NULL ); -titan_request_irq (61 +16 , titan_intr_nop,IRQF_DISABLED , +titan_request_irq (61 +16 , titan_intr_nop,0 ,"PChip 1 H_Error" ,NULL ); -titan_request_irq (60 +16 , titan_intr_nop,IRQF_DISABLED , +titan_request_irq (60 +16 , titan_intr_nop,0 ,"PChip 0 C_Error" ,NULL ); -titan_request_irq (59 +16 , titan_intr_nop,IRQF_DISABLED , +titan_request_irq (59 +16 , titan_intr_nop,0 ,"PChip 1 C_Error" ,NULL );/*
@@ -358,9 +358,9 @@ privateer_init_pci(void)* Hook a couple of extra err interrupts that the * common titan code won't. */ -titan_request_irq (53 +16 , titan_intr_nop,IRQF_DISABLED , +titan_request_irq (53 +16 , titan_intr_nop,0 ,"NMI" ,NULL ); -titan_request_irq (50 +16 , titan_intr_nop,IRQF_DISABLED , +titan_request_irq (50 +16 , titan_intr_nop,0 ,"Temperature Warning" ,NULL );/*
arch/arm/common/time-acorn.c +1 -1
@@ -75,7 +75,7 @@ ioc_timer_interrupt(int irq, void *dev_istatic struct irqaction ioc_timer_irq = { .name ="timer" , - .flags =IRQF_DISABLED , + .flags =0 , .handler = ioc_timer_interrupt };
arch/arm/include/asm/floppy.h +1 -1
@@ -25,7 +25,7 @@#define fd_inb (port) inb((port))#define fd_request_irq () request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\ - IRQF_DISABLED,"floppy",NULL) + 0,"floppy",NULL)#define fd_free_irq () free_irq(IRQ_FLOPPYDISK,NULL)#define fd_disable_irq () disable_irq(IRQ_FLOPPYDISK)#define fd_enable_irq () enable_irq(IRQ_FLOPPYDISK)
arch/arm/mach-aaec2000/core.c +1 -1
@@ -138,7 +138,7 @@ aaec2000_timer_interrupt(int irq, void *static struct irqaction aaec2000_timer_irq = { .name ="AAEC-2000 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = aaec2000_timer_interrupt, };
arch/arm/mach-at91/at91rm9200_time.c +1 -1
@@ -81,7 +81,7 @@ static irqreturn_t at91rm9200_timer_intestatic struct irqaction at91rm9200_timer_irq = { .name ="at91_tick" , - .flags =IRQF_SHARED |IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_SHARED |IRQF_TIMER |IRQF_IRQPOLL , .handler = at91rm9200_timer_interrupt };
arch/arm/mach-at91/at91sam926x_time.c +1 -1
@@ -122,7 +122,7 @@ static irqreturn_t at91sam926x_pit_interstatic struct irqaction at91sam926x_pit_irq = { .name ="at91_tick" , - .flags =IRQF_SHARED |IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_SHARED |IRQF_TIMER |IRQF_IRQPOLL , .handler = at91sam926x_pit_interrupt };
arch/arm/mach-at91/at91x40_time.c +1 -1
@@ -49,7 +49,7 @@ static irqreturn_t at91x40_timer_interrustatic struct irqaction at91x40_timer_irq = { .name ="at91_tick" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = at91x40_timer_interrupt };
arch/arm/mach-clps711x/time.c +1 -1
@@ -56,7 +56,7 @@ p720t_timer_interrupt(int irq, void *devstatic struct irqaction clps711x_timer_irq = { .name ="CLPS711x Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = p720t_timer_interrupt, };
arch/arm/mach-davinci/time.c +2 -2
@@ -159,7 +159,7 @@ static struct timer_s timers[] = { .name = "clockevent", .opts = TIMER_OPTS_DISABLED, .irqaction = { - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .handler = timer_interrupt, } },
@@ -168,7 +168,7 @@ static struct timer_s timers[] = { .period = ~0, .opts = TIMER_OPTS_PERIODIC, .irqaction = { - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .handler = freerun_interrupt, } },
arch/arm/mach-ebsa110/core.c +1 -1
@@ -195,7 +195,7 @@ ebsa110_timer_interrupt(int irq, void *dstatic struct irqaction ebsa110_timer_irq = { .name ="EBSA110 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = ebsa110_timer_interrupt, };
arch/arm/mach-ep93xx/core.c +1 -1
@@ -115,7 +115,7 @@ static int ep93xx_timer_interrupt(int irstatic struct irqaction ep93xx_timer_irq = { .name ="ep93xx timer" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = ep93xx_timer_interrupt, };
arch/arm/mach-footbridge/dc21285-timer.c +1 -1
@@ -41,7 +41,7 @@ timer1_interrupt(int irq, void *dev_id)static struct irqaction footbridge_timer_irq = { .name ="Timer1 timer tick" , .handler = timer1_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , };/*
arch/arm/mach-footbridge/dc21285.c +5 -5
@@ -338,15 +338,15 @@ void __init dc21285_preinit(void)/* * We don't care if these fail. */ -dc21285_request_irq (IRQ_PCI_SERR , dc21285_serr_irq,IRQF_DISABLED , +dc21285_request_irq (IRQ_PCI_SERR , dc21285_serr_irq,0 ,"PCI system error" , &serr_timer); -dc21285_request_irq (IRQ_PCI_PERR , dc21285_parity_irq,IRQF_DISABLED , +dc21285_request_irq (IRQ_PCI_PERR , dc21285_parity_irq,0 ,"PCI parity error" , &perr_timer); -dc21285_request_irq (IRQ_PCI_ABORT , dc21285_abort_irq,IRQF_DISABLED , +dc21285_request_irq (IRQ_PCI_ABORT , dc21285_abort_irq,0 ,"PCI abort" ,NULL ); -dc21285_request_irq (IRQ_DISCARD_TIMER , dc21285_discard_irq,IRQF_DISABLED , +dc21285_request_irq (IRQ_DISCARD_TIMER , dc21285_discard_irq,0 ,"Discard timer" ,NULL ); -dc21285_request_irq (IRQ_PCI_DPERR , dc21285_dparity_irq,IRQF_DISABLED , +dc21285_request_irq (IRQ_PCI_DPERR , dc21285_dparity_irq,0 ,"PCI data parity" ,NULL );if (cfn_mode) {
arch/arm/mach-footbridge/isa-timer.c +1 -1
@@ -71,7 +71,7 @@ isa_timer_interrupt(int irq, void *dev_istatic struct irqaction isa_timer_irq = { .name ="ISA timer tick" , .handler = isa_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , };static void __init isa_timer_init (void )
arch/arm/mach-h720x/cpu-h7201.c +1 -1
@@ -37,7 +37,7 @@ h7201_timer_interrupt(int irq, void *devstatic struct irqaction h7201_timer_irq = { .name ="h7201 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = h7201_timer_interrupt, };
arch/arm/mach-h720x/cpu-h7202.c +1 -1
@@ -166,7 +166,7 @@ static struct irq_chip h7202_timerx_chipstatic struct irqaction h7202_timer_irq = { .name ="h7202 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = h7202_timer_interrupt, };
arch/arm/mach-imx/time.c +1 -1
@@ -55,7 +55,7 @@ imx_timer_interrupt(int irq, void *dev_istatic struct irqaction imx_timer_irq = { .name ="i.MX Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = imx_timer_interrupt, };
arch/arm/mach-integrator/core.c +1 -1
@@ -297,7 +297,7 @@ integrator_timer_interrupt(int irq, voidstatic struct irqaction integrator_timer_irq = { .name ="Integrator Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = integrator_timer_interrupt, };
arch/arm/mach-ixp2000/core.c +1 -1
@@ -213,7 +213,7 @@ static int ixp2000_timer_interrupt(int istatic struct irqaction ixp2000_timer_irq = { .name ="IXP2000 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = ixp2000_timer_interrupt, };
arch/arm/mach-ixp23xx/core.c +1 -1
@@ -359,7 +359,7 @@ ixp23xx_timer_interrupt(int irq, void *dstatic struct irqaction ixp23xx_timer_irq = { .name ="IXP23xx Timer Tick" , .handler = ixp23xx_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , };void __init ixp23xx_init_timer (void )
arch/arm/mach-ixp4xx/common.c +1 -1
@@ -279,7 +279,7 @@ static irqreturn_t ixp4xx_timer_interrupstatic struct irqaction ixp4xx_timer_irq = { .name ="timer1" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = ixp4xx_timer_interrupt, };
arch/arm/mach-ixp4xx/dsmg600-setup.c +1 -1
@@ -239,7 +239,7 @@ static void __init dsmg600_init(void) pm_power_off = dsmg600_power_off;if (request_irq (gpio_to_irq (DSMG600_RB_GPIO ), &dsmg600_reset_handler, -IRQF_DISABLED |IRQF_TRIGGER_LOW , +IRQF_TRIGGER_LOW ,"DSM-G600 reset button" ,NULL ) <0 ) { printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
arch/arm/mach-ixp4xx/fsg-setup.c +2 -2
@@ -203,7 +203,7 @@ static void __init fsg_init(void)platform_add_devices (fsg_devices,ARRAY_SIZE (fsg_devices));if (request_irq (gpio_to_irq (FSG_RB_GPIO ), &fsg_reset_handler, -IRQF_DISABLED |IRQF_TRIGGER_LOW , +IRQF_TRIGGER_LOW ,"FSG reset button" ,NULL ) <0 ) { printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
@@ -211,7 +211,7 @@ static void __init fsg_init(void) }if (request_irq (gpio_to_irq (FSG_SB_GPIO ), &fsg_power_handler, -IRQF_DISABLED |IRQF_TRIGGER_LOW , +IRQF_TRIGGER_LOW ,"FSG power button" ,NULL ) <0 ) { printk(KERN_DEBUG "Power Button IRQ %d not available\n",
arch/arm/mach-ixp4xx/nas100d-setup.c +1 -1
@@ -258,7 +258,7 @@ static void __init nas100d_init(void) pm_power_off = nas100d_power_off;if (request_irq (gpio_to_irq (NAS100D_RB_GPIO ), &nas100d_reset_handler, -IRQF_DISABLED |IRQF_TRIGGER_LOW , +IRQF_TRIGGER_LOW ,"NAS100D reset button" ,NULL ) <0 ) { printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
arch/arm/mach-ixp4xx/nslu2-setup.c +2 -2
@@ -244,7 +244,7 @@ static void __init nslu2_init(void) pm_power_off = nslu2_power_off;if (request_irq (gpio_to_irq (NSLU2_RB_GPIO ), &nslu2_reset_handler, -IRQF_DISABLED |IRQF_TRIGGER_LOW , +IRQF_TRIGGER_LOW ,"NSLU2 reset button" ,NULL ) <0 ) { printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
@@ -252,7 +252,7 @@ static void __init nslu2_init(void) }if (request_irq (gpio_to_irq (NSLU2_PB_GPIO ), &nslu2_power_handler, -IRQF_DISABLED |IRQF_TRIGGER_HIGH , +IRQF_TRIGGER_HIGH ,"NSLU2 power button" ,NULL ) <0 ) { printk(KERN_DEBUG "Power Button IRQ %d not available\n",
arch/arm/mach-ks8695/time.c +1 -1
@@ -76,7 +76,7 @@ static irqreturn_t ks8695_timer_interrupstatic struct irqaction ks8695_timer_irq = { .name ="ks8695_tick" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = ks8695_timer_interrupt, };
arch/arm/mach-lh7a40x/time.c +1 -1
@@ -49,7 +49,7 @@ lh7a40x_timer_interrupt(int irq, void *dstatic struct irqaction lh7a40x_timer_irq = { .name ="LHA740x Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = lh7a40x_timer_interrupt, };
arch/arm/mach-msm/timer.c +2 -2
@@ -125,7 +125,7 @@ static struct msm_clock msm_clocks[] = { }, .irq = { .name = "gp_timer", - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_TRIGGER_RISING, + .flags = IRQF_TIMER | IRQF_TRIGGER_RISING, .handler = msm_timer_interrupt, .dev_id = &msm_clocks[0 ].clockevent, .irq = INT_GP_TIMER_EXP
@@ -152,7 +152,7 @@ static struct msm_clock msm_clocks[] = { }, .irq = { .name = "dg_timer", - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_TRIGGER_RISING, + .flags = IRQF_TIMER | IRQF_TRIGGER_RISING, .handler = msm_timer_interrupt, .dev_id = &msm_clocks[1 ].clockevent, .irq = INT_DEBUG_TIMER_EXP
arch/arm/mach-netx/time.c +1 -1
@@ -100,7 +100,7 @@ netx_timer_interrupt(int irq, void *dev_static struct irqaction netx_timer_irq = { .name ="NetX Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = netx_timer_interrupt, };
arch/arm/mach-ns9xxx/time-ns9360.c +1 -1
@@ -121,7 +121,7 @@ static irqreturn_t ns9360_clockevent_hanstatic struct irqaction ns9360_clockevent_action = { .name ="ns9360-timer" __stringify(TIMER_CLOCKEVENT ), - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = ns9360_clockevent_handler, };
arch/arm/mach-omap1/pm.c +1 -1
@@ -640,7 +640,7 @@ static irqreturn_t omap_wakeup_interruptstatic struct irqaction omap_wakeup_irq = { .name ="peripheral wakeup" , - .flags =IRQF_DISABLED , + .flags =0 , .handler = omap_wakeup_interrupt };
arch/arm/mach-omap1/time.c +2 -2
@@ -157,7 +157,7 @@ static irqreturn_t omap_mpu_timer1_interstatic struct irqaction omap_mpu_timer1_irq = { .name ="mpu_timer1" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = omap_mpu_timer1_interrupt, };
@@ -194,7 +194,7 @@ static irqreturn_t omap_mpu_timer2_interstatic struct irqaction omap_mpu_timer2_irq = { .name ="mpu_timer2" , - .flags =IRQF_DISABLED , + .flags =0 , .handler = omap_mpu_timer2_interrupt, };
arch/arm/mach-omap1/timer32k.c +1 -1
@@ -171,7 +171,7 @@ static irqreturn_t omap_32k_timer_interrstatic struct irqaction omap_32k_timer_irq = { .name ="32KHz timer" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = omap_32k_timer_interrupt, };
arch/arm/mach-omap2/timer-gp.c +1 -1
@@ -52,7 +52,7 @@ static irqreturn_t omap2_gp_timer_interrstatic struct irqaction omap2_gp_timer_irq = { .name ="gp timer" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = omap2_gp_timer_interrupt, };
arch/arm/mach-pnx4008/time.c +1 -1
@@ -78,7 +78,7 @@ static irqreturn_t pnx4008_timer_interrustatic struct irqaction pnx4008_timer_irq = { .name ="PNX4008 Tick Timer" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = pnx4008_timer_interrupt };
arch/arm/mach-pxa/am200epd.c +1 -1
@@ -293,7 +293,7 @@ static int am200_setup_irq(struct fb_infint ret; ret =request_irq (IRQ_GPIO (RDY_GPIO_PIN ), am200_handle_irq, -IRQF_DISABLED |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_FALLING ,"AM200" , info->par);if (ret)dev_err (&am200_device->dev,"request_irq failed: %d\n" , ret);
arch/arm/mach-pxa/cm-x270.c +1 -1
@@ -286,7 +286,7 @@ static int cmx270_mci_init(struct devicegpio_direction_output (GPIO105_MMC_POWER ,0 ); err =request_irq (CMX270_MMC_IRQ , cmx270_detect_int, -IRQF_DISABLED |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_FALLING ,"MMC card detect" , data);if (err) {gpio_free (GPIO105_MMC_POWER );
arch/arm/mach-pxa/corgi.c +1 -1
@@ -333,7 +333,7 @@ static int corgi_mci_init(struct device corgi_mci_platform_data.detect_delay =msecs_to_jiffies (250 ); err =request_irq (CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int, -IRQF_DISABLED |IRQF_TRIGGER_RISING | +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"MMC card detect" , data);if (err) {
arch/arm/mach-pxa/dma.c +1 -1
@@ -131,7 +131,7 @@ int __init pxa_init_dma(int num_ch) dma_channels[i].prio =min ((i &0xf ) >>2 ,DMA_PRIO_LOW ); } - ret =request_irq (IRQ_DMA , dma_irq_handler,IRQF_DISABLED ,"DMA" ,NULL ); + ret =request_irq (IRQ_DMA , dma_irq_handler,0 ,"DMA" ,NULL );if (ret) {printk (KERN_CRIT "Wow! Can't register IRQ for DMA\n" );kfree (dma_channels);
arch/arm/mach-pxa/em-x270.c +1 -1
@@ -400,7 +400,7 @@ static int em_x270_mci_init(struct devic void *data) {int err =request_irq (EM_X270_MMC_CD , em_x270_detect_int, -IRQF_DISABLED |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_FALLING ,"MMC card detect" , data);if (err) { printk(KERN_ERR "%s: can't request MMC card detect IRQ: %d\n",
arch/arm/mach-pxa/magician.c +1 -1
@@ -619,7 +619,7 @@ static int magician_mci_init(struct deviint err; err =request_irq (IRQ_MAGICIAN_SD , detect_irq, -IRQF_DISABLED |IRQF_SAMPLE_RANDOM , +IRQF_SAMPLE_RANDOM ,"MMC card detect" , data);if (err) goto err_request_irq;
arch/arm/mach-pxa/mainstone.c +1 -1
@@ -423,7 +423,7 @@ static int mainstone_mci_init(struct dev*/ MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL ; - err =request_irq (MAINSTONE_MMC_IRQ , mstone_detect_int,IRQF_DISABLED , + err =request_irq (MAINSTONE_MMC_IRQ , mstone_detect_int,0 ,"MMC card detect" , data);if (err)printk (KERN_ERR "mainstone_mci_init: MMC/SD: can't request MMC card detect IRQ\n" );
arch/arm/mach-pxa/mioa701.c +1 -1
@@ -497,7 +497,7 @@ static int mci_init(struct device *dev, goto err_gpio;/* enable RE/FE interrupt on card insertion and removal */ rc =request_irq (irq, detect_int, -IRQF_DISABLED |IRQF_TRIGGER_RISING | +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"MMC card detect" , data);if (rc)
arch/arm/mach-pxa/palmtx.c +1 -1
@@ -146,7 +146,7 @@ static int palmtx_mci_init(struct deviceif (err) goto err2; err =request_irq (gpio_to_irq (GPIO_NR_PALMTX_SD_DETECT_N ), - palmtx_detect_int,IRQF_DISABLED |IRQF_SAMPLE_RANDOM | + palmtx_detect_int,IRQF_SAMPLE_RANDOM |IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING ,"SD/MMC card detect" , data);if (err) {
arch/arm/mach-pxa/palmz72.c +1 -1
@@ -139,7 +139,7 @@ static int palmz72_mci_init(struct devicif (err) goto err2; err =request_irq (gpio_to_irq (GPIO_NR_PALMZ72_SD_DETECT_N ), - palmz72_detect_int,IRQF_DISABLED |IRQF_SAMPLE_RANDOM | + palmz72_detect_int,IRQF_SAMPLE_RANDOM |IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING ,"SD/MMC card detect" , data);if (err) {
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -293,7 +293,7 @@ static int pcm990_mci_init(struct device {int err; - err =request_irq (PCM027_MMCDET_IRQ , mci_detect_int,IRQF_DISABLED , + err =request_irq (PCM027_MMCDET_IRQ , mci_detect_int,0 ,"MMC card detect" , data);if (err) printk(KERN_ERR "pcm990_mci_init: MMC/SD: can't request MMC "
arch/arm/mach-pxa/poodle.c +1 -1
@@ -290,7 +290,7 @@ static int poodle_mci_init(struct device poodle_mci_platform_data.detect_delay =msecs_to_jiffies (250 ); err =request_irq (POODLE_IRQ_GPIO_nSD_DETECT, poodle_detect_int, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"MMC card detect" , data);if (err) { pr_err("%s: MMC/SD: can't request MMC card detect IRQ\n",
arch/arm/mach-pxa/sharpsl_pm.c +4 -4
@@ -152,18 +152,18 @@ void sharpsl_pm_pxa_init(void)pxa_gpio_mode (sharpsl_pm.machinfo->gpio_batlock |GPIO_IN );/* Register interrupt handlers */ -if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr,IRQF_DISABLED ,"AC Input Detect" , sharpsl_ac_isr)) { +if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr,0 ,"AC Input Detect" , sharpsl_ac_isr)) {dev_err (sharpsl_pm.dev,"Could not get irq %d.\n" ,IRQ_GPIO (sharpsl_pm.machinfo->gpio_acin)); }else set_irq_type (IRQ_GPIO (sharpsl_pm.machinfo->gpio_acin),IRQ_TYPE_EDGE_BOTH ); -if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr,IRQF_DISABLED ,"Battery Cover" , sharpsl_fatal_isr)) { +if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr,0 ,"Battery Cover" , sharpsl_fatal_isr)) {dev_err (sharpsl_pm.dev,"Could not get irq %d.\n" ,IRQ_GPIO (sharpsl_pm.machinfo->gpio_batlock)); }else set_irq_type (IRQ_GPIO (sharpsl_pm.machinfo->gpio_batlock),IRQ_TYPE_EDGE_FALLING );if (sharpsl_pm.machinfo->gpio_fatal) { -if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr,IRQF_DISABLED ,"Fatal Battery" , sharpsl_fatal_isr)) { +if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr,0 ,"Fatal Battery" , sharpsl_fatal_isr)) {dev_err (sharpsl_pm.dev,"Could not get irq %d.\n" ,IRQ_GPIO (sharpsl_pm.machinfo->gpio_fatal)); }else set_irq_type (IRQ_GPIO (sharpsl_pm.machinfo->gpio_fatal),IRQ_TYPE_EDGE_FALLING );
@@ -172,7 +172,7 @@ void sharpsl_pm_pxa_init(void)if (sharpsl_pm.machinfo->batfull_irq) {/* Register interrupt handler. */ -if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr,IRQF_DISABLED ,"CO" , sharpsl_chrg_full_isr)) { +if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr,0 ,"CO" , sharpsl_chrg_full_isr)) {dev_err (sharpsl_pm.dev,"Could not get irq %d.\n" ,IRQ_GPIO (sharpsl_pm.machinfo->gpio_batfull)); }else set_irq_type (IRQ_GPIO (sharpsl_pm.machinfo->gpio_batfull),IRQ_TYPE_EDGE_RISING );
arch/arm/mach-pxa/spitz.c +1 -1
@@ -449,7 +449,7 @@ static int spitz_mci_init(struct device spitz_mci_platform_data.detect_delay =msecs_to_jiffies (250 ); err =request_irq (SPITZ_IRQ_GPIO_nSD_DETECT, spitz_detect_int, -IRQF_DISABLED |IRQF_TRIGGER_RISING | +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"MMC card detect" , data);if (err) {
arch/arm/mach-pxa/time.c +1 -1
@@ -142,7 +142,7 @@ static struct clocksource cksrc_pxa_oscrstatic struct irqaction pxa_ost0_irq = { .name ="ost0" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = pxa_ost0_interrupt, .dev_id = &ckevt_pxa_osmr0, };
arch/arm/mach-pxa/tosa.c +1 -1
@@ -265,7 +265,7 @@ static int tosa_mci_init(struct device * goto err_gpio_detect_dir; err =request_irq (TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"MMC/SD card detect" , data);if (err) {printk (KERN_ERR "tosa_mci_init: MMC/SD: can't request MMC card detect IRQ\n" );
arch/arm/mach-pxa/trizeps4.c +1 -1
@@ -348,7 +348,7 @@ static int trizeps4_mci_init(struct deviint err; err =request_irq (TRIZEPS4_MMC_IRQ , mci_detect_int, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_SAMPLE_RANDOM , +IRQF_TRIGGER_RISING |IRQF_SAMPLE_RANDOM ,"MMC card detect" , data);if (err) { printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request"
arch/arm/mach-realview/core.c +1 -1
@@ -657,7 +657,7 @@ static irqreturn_t realview_timer_interrstatic struct irqaction realview_timer_irq = { .name ="RealView Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = realview_timer_interrupt, };
arch/arm/mach-rpc/dma.c +1 -1
@@ -128,7 +128,7 @@ static irqreturn_t iomd_dma_handle(int istatic int iomd_request_dma (dmach_t channel,dma_t *dma) {return request_irq (dma->dma_irq, iomd_dma_handle, -IRQF_DISABLED , dma->device_id, dma); +0 , dma->device_id, dma); }static void iomd_free_dma (dmach_t channel,dma_t *dma)
arch/arm/mach-s3c2410/usb-simtec.c +1 -1
@@ -79,7 +79,7 @@ static void usb_simtec_enableoc(struct sif (on) { ret =request_irq (IRQ_USBOC , usb_simtec_ocirq, -IRQF_DISABLED |IRQF_TRIGGER_RISING | +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"USB Over-current" , info);if (ret !=0 ) {
arch/arm/mach-sa1100/collie_pm.c +2 -2
@@ -46,12 +46,12 @@ static void collie_charger_init(void) ad_revise = sharpsl_param.adadj;/* Register interrupt handler. */ -if ((err =request_irq (COLLIE_IRQ_GPIO_AC_IN , sharpsl_ac_isr,IRQF_DISABLED , +if ((err =request_irq (COLLIE_IRQ_GPIO_AC_IN , sharpsl_ac_isr,0 ,"ACIN" , sharpsl_ac_isr))) {printk ("Could not get irq %d.\n" ,COLLIE_IRQ_GPIO_AC_IN );return ; } -if ((err =request_irq (COLLIE_IRQ_GPIO_CO , sharpsl_chrg_full_isr,IRQF_DISABLED , +if ((err =request_irq (COLLIE_IRQ_GPIO_CO , sharpsl_chrg_full_isr,0 ,"CO" , sharpsl_chrg_full_isr))) {free_irq (COLLIE_IRQ_GPIO_AC_IN , sharpsl_ac_isr);printk ("Could not get irq %d.\n" ,COLLIE_IRQ_GPIO_CO );
arch/arm/mach-sa1100/dma.c +1 -1
@@ -124,7 +124,7 @@ int sa1100_request_dma (dma_device_t dev i = dma - dma_chan; regs = (dma_regs_t *)&DDAR (i); - err =request_irq (IRQ_DMA0 + i, dma_irq_handler,IRQF_DISABLED , + err =request_irq (IRQ_DMA0 + i, dma_irq_handler,0 , device_id, regs);if (err) { printk(KERN_ERR
arch/arm/mach-sa1100/h3600.c +1 -1
@@ -740,7 +740,7 @@ static void h3800_IRQ_demux(unsigned intstatic struct irqaction h3800_irq = { .name ="h3800_asic" , .handler = h3800_IRQ_demux, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , };u32 kpio_int_shadow =0 ;
arch/arm/mach-sa1100/time.c +1 -1
@@ -93,7 +93,7 @@ static struct clocksource cksrc_sa1100_ostatic struct irqaction sa1100_timer_irq = { .name ="ost0" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = sa1100_ost0_interrupt, .dev_id = &ckevt_sa1100_osmr0, };
arch/arm/mach-shark/core.c +1 -1
@@ -90,7 +90,7 @@ shark_timer_interrupt(int irq, void *devstatic struct irqaction shark_timer_irq = { .name ="Shark Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = shark_timer_interrupt, };
arch/arm/mach-versatile/core.c +1 -1
@@ -930,7 +930,7 @@ static irqreturn_t versatile_timer_interstatic struct irqaction versatile_timer_irq = { .name ="Versatile Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = versatile_timer_interrupt, };
arch/arm/mach-w90x900/time.c +1 -1
@@ -48,7 +48,7 @@ w90x900_timer_interrupt(int irq, void *dstatic struct irqaction w90x900_timer_irq = { .name ="w90x900 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = w90x900_timer_interrupt, };
arch/arm/oprofile/op_model_arm11_core.c +1 -1
@@ -138,7 +138,7 @@ int arm11_request_interrupts(int *irqs,int ret =0 ;for (i =0 ; i < nr; i++) { - ret =request_irq (irqs[i], arm11_pmu_interrupt,IRQF_DISABLED ,"CP15 PMU" ,NULL ); + ret =request_irq (irqs[i], arm11_pmu_interrupt,0 ,"CP15 PMU" ,NULL );if (ret !=0 ) {printk (KERN_ERR "oprofile: unable to request IRQ%u for MPCORE-EM\n" , irqs[i]);
arch/arm/oprofile/op_model_mpcore.c +1 -1
@@ -119,7 +119,7 @@ static int scu_start(void)*/ for (i =0 ; i <NUM_SCU_COUNTERS ; i++) {if (scu_em_used & (1 << i)) { - ret =request_irq (IRQ_EB11MP_PMU_SCU0 + i, scu_em_interrupt,IRQF_DISABLED ,"SCU PMU" ,NULL ); + ret =request_irq (IRQ_EB11MP_PMU_SCU0 + i, scu_em_interrupt,0 ,"SCU PMU" ,NULL );if (ret) {printk (KERN_ERR "oprofile: unable to request IRQ%u for SCU Event Monitor\n" ,IRQ_EB11MP_PMU_SCU0 + i);
arch/arm/oprofile/op_model_v7.c +1 -1
@@ -306,7 +306,7 @@ int armv7_request_interrupts(int *irqs,for (i =0 ; i < nr; i++) { ret =request_irq (irqs[i], armv7_pmnc_interrupt, -IRQF_DISABLED ,"CP15 PMNC" ,NULL ); +0 ,"CP15 PMNC" ,NULL );if (ret !=0 ) { printk(KERN_ERR "oprofile: unable to request IRQ%u" " for ARMv7\n",
arch/arm/oprofile/op_model_xscale.c +1 -1
@@ -382,7 +382,7 @@ static int xscale_pmu_start(void)int ret;u32 pmnc =read_pmnc (); - ret =request_irq (XSCALE_PMU_IRQ , xscale_pmu_interrupt,IRQF_DISABLED , + ret =request_irq (XSCALE_PMU_IRQ , xscale_pmu_interrupt,0 ,"XScale PMU" , (void *)results);if (ret <0 ) {
arch/arm/plat-iop/time.c +1 -1
@@ -71,7 +71,7 @@ iop_timer_interrupt(int irq, void *dev_istatic struct irqaction iop_timer_irq = { .name ="IOP Timer Tick" , .handler = iop_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , };static unsigned long iop_tick_rate;
arch/arm/plat-mxc/time.c +1 -1
@@ -164,7 +164,7 @@ static irqreturn_t mxc_timer_interrupt(istatic struct irqaction mxc_timer_irq = { .name ="i.MX Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = mxc_timer_interrupt, };
arch/arm/plat-omap/dma.c +1 -1
@@ -1921,7 +1921,7 @@ static irqreturn_t omap2_dma_irq_handlerstatic struct irqaction omap24xx_dma_irq = { .name ="DMA" , .handler = omap2_dma_irq_handler, - .flags =IRQF_DISABLED + .flags =0 , };#else
arch/arm/plat-omap/mailbox.c +1 -1
@@ -348,7 +348,7 @@ static int omap_mbox_init(struct omap_mb goto fail_create_mbox; } - ret =request_irq (mbox->irq, mbox_interrupt,IRQF_DISABLED , + ret =request_irq (mbox->irq, mbox_interrupt,0 , mbox->name, mbox);if (unlikely (ret)) { printk(KERN_ERR
arch/arm/plat-orion/time.c +1 -1
@@ -166,7 +166,7 @@ static irqreturn_t orion_timer_interruptstatic struct irqaction orion_timer_irq = { .name ="orion_tick" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = orion_timer_interrupt };
arch/arm/plat-s3c/time.c +1 -1
@@ -138,7 +138,7 @@ s3c2410_timer_interrupt(int irq, void *dstatic struct irqaction s3c2410_timer_irq = { .name ="S3C2410 Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = s3c2410_timer_interrupt, };
arch/arm/plat-s3c24xx/dma.c +1 -1
@@ -762,7 +762,7 @@ int s3c2410_dma_request(unsigned int cha chan->irq_claimed =1 ;local_irq_restore (flags); - err =request_irq (chan->irq, s3c2410_dma_irq,IRQF_DISABLED , + err =request_irq (chan->irq, s3c2410_dma_irq,0 , client->name, (void *)chan);local_irq_save (flags);
arch/avr32/kernel/time.c +1 -1
@@ -59,7 +59,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction timer_irqaction = { .handler = timer_interrupt,/* Oprofile uses the same irq as the timer, so allow it to be shared */ - .flags =IRQF_TIMER |IRQF_DISABLED |IRQF_SHARED , + .flags =IRQF_TIMER |IRQF_SHARED , .name ="avr32_comparator" , };
arch/blackfin/kernel/bfin_dma_5xx.c +1 -1
@@ -148,7 +148,7 @@ int set_dma_callback(unsigned int channeint ret;unsigned int irq =channel2irq (channel); - ret =request_irq (irq, callback,IRQF_DISABLED , + ret =request_irq (irq, callback,0 , dma_ch[channel].device_id, data);if (ret)return ret;
arch/blackfin/kernel/time-ts.c +1 -1
@@ -168,7 +168,7 @@ static struct clock_event_device clockevstatic struct irqaction bfin_timer_irq = { .name ="Blackfin Core Timer" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = timer_interrupt, .dev_id = &clockevent_bfin, };
arch/blackfin/kernel/time.c +2 -2
@@ -25,9 +25,9 @@static struct irqaction bfin_timer_irq = { .name ="Blackfin Timer Tick" , #ifdef CONFIG_IRQ_PER_CPU - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , #else - .flags =IRQF_DISABLED + .flags =0 , #endif };
arch/blackfin/mach-bf537/boards/cm_bf537.c +1 -1
@@ -494,7 +494,7 @@ static struct platform_device bfin_mac_dstatic struct pata_platform_info bfin_pata_platform_data = { .ioport_shift =2 , - .irq_type =IRQF_TRIGGER_HIGH |IRQF_DISABLED , + .irq_type =IRQF_TRIGGER_HIGH , };static struct resource bfin_pata_resources[] = {
arch/blackfin/mach-bf537/boards/stamp.c +1 -1
@@ -1124,7 +1124,7 @@ static struct platform_device bfin_sportstatic struct pata_platform_info bfin_pata_platform_data = { .ioport_shift =1 , - .irq_flags =IRQF_TRIGGER_HIGH |IRQF_DISABLED , + .irq_flags =IRQF_TRIGGER_HIGH , };static struct resource bfin_pata_resources[] = {
arch/blackfin/mach-bf537/boards/tcm_bf537.c +1 -1
@@ -496,7 +496,7 @@ static struct platform_device bfin_mac_dstatic struct pata_platform_info bfin_pata_platform_data = { .ioport_shift =2 , - .irq_type =IRQF_TRIGGER_HIGH |IRQF_DISABLED , + .irq_type =IRQF_TRIGGER_HIGH , };static struct resource bfin_pata_resources[] = {
arch/blackfin/mach-bf561/boards/cm_bf561.c +1 -1
@@ -333,7 +333,7 @@ static struct platform_device bfin_sir0_static struct pata_platform_info bfin_pata_platform_data = { .ioport_shift =2 , - .irq_type =IRQF_TRIGGER_HIGH |IRQF_DISABLED , + .irq_type =IRQF_TRIGGER_HIGH , };static struct resource bfin_pata_resources[] = {
arch/blackfin/mach-bf561/smp.c +1 -1
@@ -132,7 +132,7 @@ void __init platform_request_ipi(irq_han {int ret; - ret =request_irq (IRQ_SUPPLE_0 , handler,IRQF_DISABLED , + ret =request_irq (IRQ_SUPPLE_0 , handler,0 ,"SMP interrupt" , handler);if (ret)panic ("Cannot request supplemental interrupt 0 for IPI service\n" );
arch/cris/arch-v10/drivers/gpio.c +2 -2
@@ -812,13 +812,13 @@ static int __init gpio_init(void)* in some tests. */ res =request_irq (TIMER0_IRQ_NBR , gpio_poll_timer_interrupt, -IRQF_SHARED |IRQF_DISABLED ,"gpio poll" , gpio_name); +IRQF_SHARED ,"gpio poll" , gpio_name);if (res) {printk (KERN_CRIT "err: timer0 irq for gpio\n" );return res; } res =request_irq (PA_IRQ_NBR , gpio_interrupt, -IRQF_SHARED |IRQF_DISABLED ,"gpio PA" , gpio_name); +IRQF_SHARED ,"gpio PA" , gpio_name);if (res)printk (KERN_CRIT "err: PA irq for gpio\n" );
arch/cris/arch-v10/drivers/sync_serial.c +2 -2
@@ -580,7 +580,7 @@ static int sync_serial_open(struct inodeif (port == &ports[0 ]) {if (request_irq (8 , manual_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,"synchronous serial manual irq" , &ports[0 ])) { printk(KERN_CRIT "Can't alloc "
@@ -590,7 +590,7 @@ static int sync_serial_open(struct inode }else if (port == &ports[1 ]) {if (request_irq (8 , manual_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,"synchronous serial manual irq" , &ports[1 ])) { printk(KERN_CRIT "Can't alloc "
arch/cris/arch-v10/kernel/time.c +1 -1
@@ -260,7 +260,7 @@ timer_interrupt(int irq, void *dev_id)static struct irqaction irq2 = { .handler = timer_interrupt, - .flags =IRQF_SHARED |IRQF_DISABLED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="timer" , };
arch/cris/arch-v32/drivers/mach-a3/gpio.c +1 -1
@@ -967,7 +967,7 @@ static int __init gpio_init(void)CRIS_LED_DISK_WRITE (0 );int res2 =request_irq (GIO_INTR_VECT , gpio_interrupt, -IRQF_SHARED |IRQF_DISABLED ,"gpio" , &alarmlist); +IRQF_SHARED ,"gpio" , &alarmlist);if (res2) {printk (KERN_ERR "err: irq for gpio\n" );return res2;
arch/cris/arch-v32/drivers/mach-fs/gpio.c +2 -2
@@ -955,11 +955,11 @@ gpio_init(void)* in some tests. */ if (request_irq (TIMER0_INTR_VECT , gpio_poll_timer_interrupt, -IRQF_SHARED |IRQF_DISABLED ,"gpio poll" , &alarmlist)) +IRQF_SHARED ,"gpio poll" , &alarmlist))printk (KERN_ERR "timer0 irq for gpio\n" );if (request_irq (GIO_INTR_VECT , gpio_pa_interrupt, -IRQF_SHARED |IRQF_DISABLED ,"gpio PA" , &alarmlist)) +IRQF_SHARED ,"gpio PA" , &alarmlist))printk (KERN_ERR "PA irq for gpio\n" );#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
arch/cris/arch-v32/kernel/fasttimer.c +1 -1
@@ -822,7 +822,7 @@ int fast_timer_init(void) fasttimer_proc_entry->read_proc = proc_fasttimer_read;#endif /* PROC_FS */ if (request_irq (TIMER0_INTR_VECT , timer_trig_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,"fast timer int" , &fast_timer_list))printk (KERN_ERR "err: fasttimer irq\n" ); fast_timer_is_init =1 ;
arch/cris/arch-v32/kernel/smp.c +1 -1
@@ -64,7 +64,7 @@ static irqreturn_t crisv32_ipi_interruptstatic int send_ipi (int vector,int wait,cpumask_t cpu_mask);static struct irqaction irq_ipi = { .handler = crisv32_ipi_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="ipi" , };
arch/cris/arch-v32/kernel/time.c +1 -1
@@ -266,7 +266,7 @@ timer_interrupt(int irq, void *dev_id)*/ static struct irqaction irq_timer = { .handler = timer_interrupt, - .flags =IRQF_SHARED |IRQF_DISABLED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="timer" };
arch/cris/arch-v32/mach-a3/arbiter.c +2 -2
@@ -256,11 +256,11 @@ static void crisv32_arbiter_init(void)crisv32_arbiter_config (1 ,EXT_REGION ,0 );if (request_irq (MEMARB_FOO_INTR_VECT , crisv32_foo_arbiter_irq, -IRQF_DISABLED ,"arbiter" ,NULL )) +0 ,"arbiter" ,NULL ))printk (KERN_ERR "Couldn't allocate arbiter IRQ\n" );if (request_irq (MEMARB_BAR_INTR_VECT , crisv32_bar_arbiter_irq, -IRQF_DISABLED ,"arbiter" ,NULL )) +0 ,"arbiter" ,NULL ))printk (KERN_ERR "Couldn't allocate arbiter IRQ\n" );#ifndef CONFIG_ETRAX_KGDB
arch/cris/arch-v32/mach-fs/arbiter.c +1 -1
@@ -184,7 +184,7 @@ static void crisv32_arbiter_init(void)crisv32_arbiter_config (EXT_REGION ,0 );crisv32_arbiter_config (INT_REGION ,0 ); -if (request_irq (MEMARB_INTR_VECT , crisv32_arbiter_irq,IRQF_DISABLED , +if (request_irq (MEMARB_INTR_VECT , crisv32_arbiter_irq,0 ,"arbiter" ,NULL ))printk (KERN_ERR "Couldn't allocate arbiter IRQ\n" );
arch/frv/kernel/irq-mb93091.c +4 -4
@@ -108,28 +108,28 @@ static irqreturn_t fpga_interrupt(int irstatic struct irqaction fpga_irq[4 ] = { [0 ] = { .handler = fpga_interrupt, - .flags =IRQF_DISABLED |IRQF_SHARED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="fpga.0" , .dev_id = (void *)0x0028UL , }, [1 ] = { .handler = fpga_interrupt, - .flags =IRQF_DISABLED |IRQF_SHARED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="fpga.1" , .dev_id = (void *)0x0050UL , }, [2 ] = { .handler = fpga_interrupt, - .flags =IRQF_DISABLED |IRQF_SHARED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="fpga.2" , .dev_id = (void *)0x1c00UL , }, [3 ] = { .handler = fpga_interrupt, - .flags =IRQF_DISABLED |IRQF_SHARED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="fpga.3" , .dev_id = (void *)0x6386UL ,
arch/frv/kernel/irq-mb93093.c +1 -1
@@ -107,7 +107,7 @@ static irqreturn_t fpga_interrupt(int irstatic struct irqaction fpga_irq[1 ] = { [0 ] = { .handler = fpga_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="fpga.0" , .dev_id = (void *)0x0700UL ,
arch/frv/kernel/irq-mb93493.c +2 -2
@@ -119,14 +119,14 @@ static irqreturn_t mb93493_interrupt(intstatic struct irqaction mb93493_irq[2 ] = { [0 ] = { .handler = mb93493_interrupt, - .flags =IRQF_DISABLED |IRQF_SHARED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="mb93493.0" , .dev_id = (void *)__addr_MB93493_IQSR (0 ), }, [1 ] = { .handler = mb93493_interrupt, - .flags =IRQF_DISABLED |IRQF_SHARED , + .flags =IRQF_SHARED , .mask =CPU_MASK_NONE , .name ="mb93493.1" , .dev_id = (void *)__addr_MB93493_IQSR (1 ),
arch/frv/kernel/time.c +1 -1
@@ -44,7 +44,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction timer_irq = { .handler = timer_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="timer" , };
arch/h8300/kernel/timer/itu.c +1 -1
@@ -59,7 +59,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction itu_irq = { .name ="itu" , .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .mask =CPU_MASK_NONE , };
arch/h8300/kernel/timer/timer16.c +1 -1
@@ -54,7 +54,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction timer16_irq = { .name ="timer-16" , .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .mask =CPU_MASK_NONE , };
arch/h8300/kernel/timer/timer8.c +1 -1
@@ -74,7 +74,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction timer8_irq = { .name ="timer-8" , .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .mask =CPU_MASK_NONE , };
arch/h8300/kernel/timer/tpu.c +1 -1
@@ -64,7 +64,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction tpu_irq = { .name ="tpu" , .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .mask =CPU_MASK_NONE , };
arch/ia64/hp/sim/simserial.c +1 -1
@@ -42,7 +42,7 @@#define NR_PORTS 1/* only one port for now */ -#define IRQ_T (info) ((info->flags & ASYNC_SHARE_IRQ) ? IRQF_SHARED : IRQF_DISABLED) +#define IRQ_T (info) ((info->flags & ASYNC_SHARE_IRQ) ? IRQF_SHARED : 0)#define SSC_GETCHAR 21
arch/ia64/kernel/irq_ia64.c +4 -4
@@ -365,7 +365,7 @@ static irqreturn_t smp_irq_move_cleanup_static struct irqaction irq_move_irqaction = { .handler = smp_irq_move_cleanup_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .name ="irq_move" };
@@ -607,19 +607,19 @@ static irqreturn_t dummy_handler (int irstatic struct irqaction ipi_irqaction = { .handler = handle_IPI, - .flags =IRQF_DISABLED , + .flags =0 , .name ="IPI" };static struct irqaction resched_irqaction = { .handler = dummy_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="resched" };static struct irqaction tlb_irqaction = { .handler = dummy_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="tlb_flush" };
arch/ia64/kernel/mca.c +6 -6
@@ -1737,38 +1737,38 @@ __setup("disable_cpe_poll", ia64_mca_disstatic struct irqaction cmci_irqaction = { .handler = ia64_mca_cmc_int_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="cmc_hndlr" };static struct irqaction cmcp_irqaction = { .handler = ia64_mca_cmc_int_caller, - .flags =IRQF_DISABLED , + .flags =0 , .name ="cmc_poll" };static struct irqaction mca_rdzv_irqaction = { .handler = ia64_mca_rendez_int_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="mca_rdzv" };static struct irqaction mca_wkup_irqaction = { .handler = ia64_mca_wakeup_int_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="mca_wkup" };#ifdef CONFIG_ACPI static struct irqaction mca_cpe_irqaction = { .handler = ia64_mca_cpe_int_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="cpe_hndlr" };static struct irqaction mca_cpep_irqaction = { .handler = ia64_mca_cpe_int_caller, - .flags =IRQF_DISABLED , + .flags =0 , .name ="cpe_poll" };#endif /* CONFIG_ACPI */
arch/ia64/kernel/perfmon.c +1 -1
@@ -6434,7 +6434,7 @@ pfm_flush_pmds(struct task_struct *task,static struct irqaction perfmon_irqaction = { .handler = pfm_interrupt_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="perfmon" };
arch/ia64/kernel/time.c +1 -1
@@ -401,7 +401,7 @@ static cycle_t itc_get_cycles(void)static struct irqaction timer_irqaction = { .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_IRQPOLL , + .flags =IRQF_IRQPOLL , .name ="timer" };
arch/ia64/xen/irq_xen.c +3 -3
@@ -105,19 +105,19 @@ xen_dummy_handler(int irq, void *dev_id)static struct irqaction xen_ipi_irqaction = { .handler = handle_IPI, - .flags =IRQF_DISABLED , + .flags =0 , .name ="IPI" };static struct irqaction xen_resched_irqaction = { .handler = xen_dummy_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="resched" };static struct irqaction xen_tlb_irqaction = { .handler = xen_dummy_handler, - .flags =IRQF_DISABLED , + .flags =0 , .name ="tlb_flush" };#endif
arch/m32r/kernel/time.c +1 -1
@@ -229,7 +229,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction irq0 = { .handler = timer_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="MFT2" , };
arch/m68k/include/asm/floppy.h +1 -1
@@ -85,7 +85,7 @@ static int fd_request_irq(void) {if (MACH_IS_Q40 )return request_irq (FLOPPY_IRQ , floppy_hardint, -IRQF_DISABLED ,"floppy" , floppy_hardint); +0 ,"floppy" , floppy_hardint);else if (MACH_IS_SUN3X )return sun3xflop_request_irq ();return -ENXIO ;
arch/m68k/include/asm/sun3xflop.h +1 -1
@@ -208,7 +208,7 @@ static int sun3xflop_request_irq(void)if (!once) { once =1 ; error =request_irq (FLOPPY_IRQ , sun3xflop_hardint, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL );return ((error ==0 ) ?0 :-1 ); }else return 0 ; }
arch/m68knommu/platform/68328/timers.c +1 -1
@@ -69,7 +69,7 @@ static irqreturn_t hw_tick(int irq, voidstatic struct irqaction m68328_timer_irq = { .name ="timer" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = hw_tick, };
arch/m68knommu/platform/68360/config.c +1 -1
@@ -58,7 +58,7 @@ static irqreturn_t hw_tick(int irq, voidstatic struct irqaction m68360_timer_irq = { .name ="timer" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = hw_tick, };
arch/m68knommu/platform/coldfire/pit.c +1 -1
@@ -119,7 +119,7 @@ static irqreturn_t pit_tick(int irq, voistatic struct irqaction pit_irq = { .name ="timer" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = pit_tick, };
arch/m68knommu/platform/coldfire/timers.c +2 -2
@@ -72,7 +72,7 @@ static irqreturn_t mcftmr_tick(int irq,static struct irqaction mcftmr_timer_irq = { .name ="timer" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = mcftmr_tick, };
@@ -162,7 +162,7 @@ irqreturn_t coldfire_profile_tick(int irstatic struct irqaction coldfire_profile_irq = { .name ="profile timer" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = coldfire_profile_tick, };
arch/mips/alchemy/common/dbdma.c +1 -1
@@ -885,7 +885,7 @@ static void au1xxx_dbdma_init(void)#error Unknown Au1x00 SOC#endif -if (request_irq (irq_nr, dbdma_interrupt,IRQF_DISABLED , +if (request_irq (irq_nr, dbdma_interrupt,0 ,"Au1xxx dbdma" , (void *)dbdma_gptr))printk (KERN_ERR "Can't get 1550 dbdma irq" ); }
arch/mips/alchemy/common/time.c +1 -1
@@ -94,7 +94,7 @@ static struct clock_event_device au1x_rtstatic struct irqaction au1x_rtcmatch2_irqaction = { .handler = au1x_rtcmatch2_irq, - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .name ="timer" , .dev_id = &au1x_rtcmatch2_clockdev, };
arch/mips/basler/excite/excite_iodev.c +1 -1
@@ -114,7 +114,7 @@ static int iodev_open(struct inode *i, sint ret;lock_kernel (); - ret =request_irq (iodev_irq, iodev_irqhdl,IRQF_DISABLED , + ret =request_irq (iodev_irq, iodev_irqhdl,0 , iodev_name, &miscdev);unlock_kernel ();
arch/mips/dec/setup.c +1 -1
@@ -107,7 +107,7 @@ static struct irqaction fpuirq = { };static struct irqaction busirq = { - .flags =IRQF_DISABLED , + .flags =0 , .name ="bus error" , };
arch/mips/include/asm/mach-generic/floppy.h +1 -1
@@ -98,7 +98,7 @@ static inline void fd_disable_irq(void)static inline int fd_request_irq (void ) {return request_irq (FLOPPY_IRQ , floppy_interrupt, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL ); }static inline void fd_free_irq (void )
arch/mips/include/asm/mach-jazz/floppy.h +1 -1
@@ -90,7 +90,7 @@ static inline void fd_disable_irq(void)static inline int fd_request_irq (void ) {return request_irq (FLOPPY_IRQ , floppy_interrupt, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL ); }static inline void fd_free_irq (void )
arch/mips/jazz/irq.c +1 -1
@@ -133,7 +133,7 @@ static irqreturn_t r4030_timer_interruptstatic struct irqaction r4030_timer_irqaction = { .handler = r4030_timer_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_CPU0 , .name ="R4030 timer" , };
arch/mips/kernel/cevt-bcm1480.c +1 -1
@@ -143,7 +143,7 @@ void __cpuinit sb1480_clockevent_init(vobcm1480_unmask_irq (cpu, irq); action->handler = sibyte_counter_handler; - action->flags =IRQF_DISABLED |IRQF_PERCPU ; + action->flags =IRQF_PERCPU ; action->mask =cpumask_of_cpu (cpu); action->name = name; action->dev_id = cd;
arch/mips/kernel/cevt-ds1287.c +1 -1
@@ -107,7 +107,7 @@ static irqreturn_t ds1287_interrupt(intstatic struct irqaction ds1287_irqaction = { .handler = ds1287_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="ds1287" , };
arch/mips/kernel/cevt-gt641xx.c +1 -1
@@ -113,7 +113,7 @@ static irqreturn_t gt641xx_timer0_interrstatic struct irqaction gt641xx_timer0_irqaction = { .handler = gt641xx_timer0_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="gt641xx_timer0" , };
arch/mips/kernel/cevt-r4k.c +1 -1
@@ -82,7 +82,7 @@ out:struct irqaction c0_compare_irqaction = { .handler = c0_compare_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="timer" , };
arch/mips/kernel/cevt-sb1250.c +1 -1
@@ -142,7 +142,7 @@ void __cpuinit sb1250_clockevent_init(vosb1250_unmask_irq (cpu, irq); action->handler = sibyte_counter_handler; - action->flags =IRQF_DISABLED |IRQF_PERCPU ; + action->flags =IRQF_PERCPU ; action->mask =cpumask_of_cpu (cpu); action->name = name; action->dev_id = cd;
arch/mips/kernel/cevt-txx9.c +1 -1
@@ -128,7 +128,7 @@ static irqreturn_t txx9tmr_interrupt(intstatic struct irqaction txx9tmr_irq = { .handler = txx9tmr_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="txx9tmr" , };
arch/mips/kernel/i8253.c +1 -1
@@ -97,7 +97,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction irq0 = { .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_NOBALANCING , + .flags =IRQF_NOBALANCING , .mask =CPU_MASK_NONE , .name ="timer" };
arch/mips/kernel/rtlx.c +1 -1
@@ -482,7 +482,7 @@ static const struct file_operations rtlxstatic struct irqaction rtlx_irq = { .handler = rtlx_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .name ="RTLX" , };
arch/mips/kernel/smtc.c +1 -1
@@ -1093,7 +1093,7 @@ static void ipi_irq_dispatch(void)static struct irqaction irq_ipi = { .handler = ipi_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .name ="SMTC_IPI" , .flags =IRQF_PERCPU };
arch/mips/mti-malta/malta-int.c +2 -2
@@ -321,13 +321,13 @@ static irqreturn_t ipi_call_interrupt(instatic struct irqaction irq_resched = { .handler = ipi_resched_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="IPI_resched" };static struct irqaction irq_call = { .handler = ipi_call_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="IPI_call" };#endif /* CONFIG_MIPS_MT_SMP */
arch/mips/nxp/pnx8550/common/int.c +2 -2
@@ -166,13 +166,13 @@ static struct irq_chip level_irq_type =static struct irqaction gic_action = { .handler = no_action, - .flags =IRQF_DISABLED , + .flags =0 , .name ="GIC" , };static struct irqaction timer_action = { .handler = no_action, - .flags =IRQF_DISABLED , + .flags =0 , .name ="Timer" , };
arch/mips/nxp/pnx8550/common/time.c +2 -2
@@ -59,7 +59,7 @@ static irqreturn_t pnx8xxx_timer_interrustatic struct irqaction pnx8xxx_timer_irq = { .handler = pnx8xxx_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="pnx8xxx_timer" , };
@@ -72,7 +72,7 @@ static irqreturn_t monotonic_interrupt(istatic struct irqaction monotonic_irqaction = { .handler = monotonic_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .name ="Monotonic timer" , };
arch/mips/pci/ops-pmcmsp.c +1 -1
@@ -404,7 +404,7 @@ int msp_pcibios_config_access(unsigned cif (pciirqflag ==0 ) {request_irq (MSP_INT_PCI ,/* Hardcoded internal MSP7120 wiring */ bpci_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,"PMC MSP PCI Host" , preg); pciirqflag = ~0 ;
arch/mips/pci/ops-tx3927.c +1 -1
@@ -224,7 +224,7 @@ void __init tx3927_setup_pcierr_irq(void {if (request_irq (TXX9_IRQ_BASE +TX3927_IR_PCI , tx3927_pcierr_interrupt, -IRQF_DISABLED ,"PCI error" , +0 ,"PCI error" , (void *)TX3927_PCIC_REG ))printk (KERN_WARNING "Failed to request irq for PCIERR\n" ); }
arch/mips/pci/pci-tx4927.c +1 -1
@@ -87,7 +87,7 @@ void __init tx4927_setup_pcierr_irq(void {if (request_irq (TXX9_IRQ_BASE +TX4927_IR_PCIERR , tx4927_pcierr_interrupt, -IRQF_DISABLED ,"PCI error" , +0 ,"PCI error" , (void *)TX4927_PCIC_REG ))printk (KERN_WARNING "Failed to request irq for PCIERR\n" ); }
arch/mips/pci/pci-tx4938.c +1 -1
@@ -138,7 +138,7 @@ void __init tx4938_setup_pcierr_irq(void {if (request_irq (TXX9_IRQ_BASE +TX4938_IR_PCIERR , tx4927_pcierr_interrupt, -IRQF_DISABLED ,"PCI error" , +0 ,"PCI error" , (void *)TX4927_PCIC_REG ))printk (KERN_WARNING "Failed to request irq for PCIERR\n" ); }
arch/mips/pci/pci-tx4939.c +1 -1
@@ -103,7 +103,7 @@ void __init tx4939_setup_pcierr_irq(void {if (request_irq (TXX9_IRQ_BASE +TX4939_IR_PCIERR , tx4927_pcierr_interrupt, -IRQF_DISABLED ,"PCI error" , +0 ,"PCI error" , (void *)TX4939_PCIC_REG ))pr_warning ("Failed to request irq for PCIERR\n" ); }
arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c +1 -1
@@ -160,7 +160,7 @@ static int msp_hwbutton_register(structCIC_EXT_SET_ACTIVE_HI (cic_ext, hirq->eirq); *CIC_EXT_CFG_REG = cic_ext; -return request_irq (hirq->irq, hwbutton_handler,IRQF_DISABLED , +return request_irq (hirq->irq, hwbutton_handler,0 , hirq->name, hirq); }
arch/mips/sgi-ip22/ip22-int.c +5 -5
@@ -162,32 +162,32 @@ static void indy_buserror_irq(void)static struct irqaction local0_cascade = { .handler = no_action, - .flags =IRQF_DISABLED , + .flags =0 , .name ="local0 cascade" , };static struct irqaction local1_cascade = { .handler = no_action, - .flags =IRQF_DISABLED , + .flags =0 , .name ="local1 cascade" , };static struct irqaction buserr = { .handler = no_action, - .flags =IRQF_DISABLED , + .flags =0 , .name ="Bus Error" , };static struct irqaction map0_cascade = { .handler = no_action, - .flags =IRQF_DISABLED , + .flags =0 , .name ="mapable0 cascade" , };#ifdef USE_LIO3_IRQ static struct irqaction map1_cascade = { .handler = no_action, - .flags =IRQF_DISABLED , + .flags =0 , .name ="mapable1 cascade" , };#define SGI_INTERRUPTS SGINT_END
arch/mips/sgi-ip27/ip27-timer.c +1 -1
@@ -104,7 +104,7 @@ static irqreturn_t hub_rt_counter_handlestruct irqaction hub_rt_irqaction = { .handler = hub_rt_counter_handler, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="hub-rt" , };
arch/mips/sgi-ip32/ip32-irq.c +2 -2
@@ -114,14 +114,14 @@ extern irqreturn_t crime_cpuerr_intr(intstruct irqaction memerr_irq = { .handler = crime_memerr_intr, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="CRIME memory error" , };struct irqaction cpuerr_irq = { .handler = crime_cpuerr_intr, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="CRIME CPU error" , };
arch/mips/sni/irq.c +1 -1
@@ -42,7 +42,7 @@ static irqreturn_t sni_isa_irq_handler(istruct irqaction sni_isa_irq = { .handler = sni_isa_irq_handler, .name ="ISA" , - .flags =IRQF_SHARED |IRQF_DISABLED + .flags =IRQF_SHARED };/*
arch/mips/sni/time.c +1 -1
@@ -66,7 +66,7 @@ static irqreturn_t a20r_interrupt(int irstatic struct irqaction a20r_irqaction = { .handler = a20r_interrupt, - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , .name ="a20r-timer" , };
arch/mips/txx9/generic/pci.c +1 -1
@@ -264,7 +264,7 @@ txx9_i8259_irq_setup(int irq)int err;init_i8259_irqs (); - err =request_irq (irq, &i8259_interrupt,IRQF_DISABLED |IRQF_SHARED , + err =request_irq (irq, &i8259_interrupt,IRQF_SHARED ,"cascade(i8259)" , (void *)(long )irq);if (!err)printk (KERN_INFO "PCI-ISA bridge PIC (irq %d)\n" , irq);
arch/mn10300/kernel/mn10300-serial.c +3 -3
@@ -851,15 +851,15 @@ static int mn10300_serial_startup(structset_irq_chip (port->tm_irq, &mn10300_serial_pic);if (request_irq (port->rx_irq, mn10300_serial_interrupt, -IRQF_DISABLED , port->rx_name, port) <0 ) +0 , port->rx_name, port) <0 ) goto error;if (request_irq (port->tx_irq, mn10300_serial_interrupt, -IRQF_DISABLED , port->tx_name, port) <0 ) +0 , port->tx_name, port) <0 ) goto error2;if (request_irq (port->tm_irq, mn10300_serial_interrupt, -IRQF_DISABLED , port->tm_name, port) <0 ) +0 , port->tm_name, port) <0 ) goto error3;mn10300_serial_mask_ack (port->tm_irq);
arch/mn10300/kernel/time.c +1 -1
@@ -36,7 +36,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction timer_irq = { .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_SHARED |IRQF_TIMER , + .flags =IRQF_SHARED |IRQF_TIMER , .mask =CPU_MASK_NONE , .name ="timer" , };
arch/parisc/include/asm/floppy.h +2 -2
@@ -157,10 +157,10 @@ static int fd_request_irq(void) {if (can_use_virtual_dma)return request_irq (FLOPPY_IRQ , floppy_hardint, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL );else return request_irq (FLOPPY_IRQ , floppy_interrupt, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL ); }static unsigned long dma_mem_alloc (unsigned long size)
arch/parisc/kernel/irq.c +2 -2
@@ -379,14 +379,14 @@ void do_cpu_irq_mask(struct pt_regs *regstatic struct irqaction timer_action = { .handler = timer_interrupt, .name ="timer" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_PERCPU |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_PERCPU |IRQF_IRQPOLL , };#ifdef CONFIG_SMP static struct irqaction ipi_action = { .handler = ipi_interrupt, .name ="IPI" , - .flags =IRQF_DISABLED |IRQF_PERCPU , + .flags =IRQF_PERCPU , };#endif
arch/powerpc/include/asm/floppy.h +2 -2
@@ -108,10 +108,10 @@ static int fd_request_irq(void) {if (can_use_virtual_dma)return request_irq (FLOPPY_IRQ , floppy_hardint, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL );else return request_irq (FLOPPY_IRQ , floppy_interrupt, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL ); }static int vdma_dma_setup (char *addr,unsigned long size,int mode,int io)
arch/powerpc/kernel/smp.c +1 -1
@@ -169,7 +169,7 @@ int smp_request_message_ipi(int virq, in return 1; }#endif - err =request_irq (virq, smp_ipi_action[msg],IRQF_DISABLED |IRQF_PERCPU , + err =request_irq (virq, smp_ipi_action[msg],IRQF_PERCPU , smp_ipi_name[msg],0 );WARN (err <0 ,"unable to request_irq %d for %s (rc %d)\n" , virq, smp_ipi_name[msg], err);
arch/powerpc/platforms/cell/beat.c +1 -1
@@ -230,7 +230,7 @@ static int __init beat_register_event(vo } ev->virq = virq; - rc =request_irq (virq, ev->handler,IRQF_DISABLED , + rc =request_irq (virq, ev->handler,0 , ev->typecode,NULL );if (rc !=0 ) { printk(KERN_ERR "Beat: failed to request virtual IRQ"
arch/powerpc/platforms/cell/celleb_scc_pciex.c +1 -1
@@ -521,7 +521,7 @@ static __init int celleb_setup_pciex(str virq =irq_create_of_mapping (oirq.controller, oirq.specifier, oirq.size);if (request_irq (virq, pciex_handle_internal_irq, -IRQF_DISABLED ,"pciex" , (void *)phb)) { +0 ,"pciex" , (void *)phb)) {pr_err ("PCIEXC:Failed to request irq\n" ); goto error; }
arch/powerpc/platforms/cell/interrupt.c +1 -1
@@ -208,7 +208,7 @@ static void iic_request_ipi(int ipi, con "iic: failed to map IPI %s\n", name);return ; } -if (request_irq (virq, iic_ipi_action,IRQF_DISABLED , name, +if (request_irq (virq, iic_ipi_action,0 , name, (void *)(long )ipi))printk (KERN_ERR "iic: failed to request IPI %s\n" , name);
arch/powerpc/platforms/cell/iommu.c +1 -1
@@ -417,7 +417,7 @@ static void cell_iommu_enable_hardware(s IIC_IRQ_IOEX_ATI | (iommu->nid << IIC_IRQ_NODE_SHIFT));BUG_ON (virq ==NO_IRQ ); - ret =request_irq (virq, ioc_interrupt,IRQF_DISABLED , + ret =request_irq (virq, ioc_interrupt,0 , iommu->name, iommu);BUG_ON (ret);
arch/powerpc/platforms/cell/pmu.c +1 -1
@@ -391,7 +391,7 @@ static int __init cbe_init_pm_irq(void) } rc =request_irq (irq, cbe_pm_irq, -IRQF_DISABLED ,"cbe-pmu-0" ,NULL ); +0 ,"cbe-pmu-0" ,NULL );if (rc) {printk ("ERROR: Request for irq on node %d failed\n" , node);
arch/powerpc/platforms/cell/spu_base.c +3 -3
@@ -440,7 +440,7 @@ static int spu_request_irqs(struct spu *snprintf (spu->irq_c0,sizeof (spu->irq_c0),"spe%02d.0" , spu->number); ret =request_irq (spu->irqs[0 ], spu_irq_class_0, -IRQF_DISABLED , +0 , spu->irq_c0, spu);if (ret) goto bail0;
@@ -449,7 +449,7 @@ static int spu_request_irqs(struct spu *snprintf (spu->irq_c1,sizeof (spu->irq_c1),"spe%02d.1" , spu->number); ret =request_irq (spu->irqs[1 ], spu_irq_class_1, -IRQF_DISABLED , +0 , spu->irq_c1, spu);if (ret) goto bail1;
@@ -458,7 +458,7 @@ static int spu_request_irqs(struct spu *snprintf (spu->irq_c2,sizeof (spu->irq_c2),"spe%02d.2" , spu->number); ret =request_irq (spu->irqs[2 ], spu_irq_class_2, -IRQF_DISABLED , +0 , spu->irq_c2, spu);if (ret) goto bail2;
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -273,7 +273,7 @@ static struct irqaction xmon_action = {static struct irqaction gatwick_cascade_action = { .handler = gatwick_action, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="cascade" , };
arch/powerpc/platforms/powermac/smp.c +1 -1
@@ -384,7 +384,7 @@ static void __init psurge_dual_sync_tb(istatic struct irqaction psurge_irqaction = { .handler = psurge_primary_intr, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="primary IPI" , };
arch/powerpc/platforms/ps3/device-init.c +1 -1
@@ -824,7 +824,7 @@ static int ps3_probe_thread(void *data)spin_lock_init (&dev.lock); - res =request_irq (irq, ps3_notification_interrupt,IRQF_DISABLED , + res =request_irq (irq, ps3_notification_interrupt,0 ,"ps3_notification" , &dev);if (res) { pr_err("%s:%u: request_irq failed %d\n", __func__, __LINE__,
arch/powerpc/platforms/ps3/smp.c +1 -1
@@ -120,7 +120,7 @@ static void __init ps3_smp_setup_cpu(int __func__, __LINE__, cpu, i, virqs[i]); result =request_irq (virqs[i], ipi_function_handler, -IRQF_DISABLED , names[i], (void *)(long )i); +0 , names[i], (void *)(long )i);if (result) virqs[i] =NO_IRQ ;
arch/powerpc/platforms/pseries/xics.c +2 -2
@@ -556,10 +556,10 @@ static void xics_request_ipi(void)set_irq_handler (ipi, handle_percpu_irq);if (firmware_has_feature (FW_FEATURE_LPAR )) rc =request_irq (ipi, xics_ipi_action_lpar, -IRQF_DISABLED |IRQF_PERCPU ,"IPI" ,NULL ); +IRQF_PERCPU ,"IPI" ,NULL );else rc =request_irq (ipi, xics_ipi_action_direct, -IRQF_DISABLED |IRQF_PERCPU ,"IPI" ,NULL ); +IRQF_PERCPU ,"IPI" ,NULL );BUG_ON (rc); }
arch/powerpc/sysdev/ppc4xx_soc.c +1 -1
@@ -115,7 +115,7 @@ static int __init ppc4xx_l2c_probe(void) }/* Install error handler */ -if (request_irq (irq, l2c_error_handler,IRQF_DISABLED ,"L2C" ,0 ) <0 ) { +if (request_irq (irq, l2c_error_handler,0 ,"L2C" ,0 ) <0 ) {printk (KERN_ERR "Cannot install L2C error handler" ", cache is not enabled\n" );of_node_put (np);
arch/sh/boards/mach-cayman/irq.c +2 -2
@@ -46,13 +46,13 @@ static irqreturn_t cayman_interrupt_pci2static struct irqaction cayman_action_smsc = { .name ="Cayman SMSC Mux" , .handler = cayman_interrupt_smsc, - .flags =IRQF_DISABLED , + .flags =0 , };static struct irqaction cayman_action_pci2 = { .name ="Cayman PCI2 Mux" , .handler = cayman_interrupt_pci2, - .flags =IRQF_DISABLED , + .flags =0 , };static void enable_cayman_irq (unsigned int irq)
arch/sh/boards/mach-hp6xx/hp6xx_apm.c +1 -1
@@ -86,7 +86,7 @@ static int __init hp6x0_apm_init(void)int ret; ret =request_irq (HP680_BTN_IRQ , hp6x0_apm_interrupt, -IRQF_DISABLED ,MODNAME ,NULL ); +0 ,MODNAME ,NULL );if (unlikely (ret <0 )) { printk(KERN_ERR MODNAME ": IRQ %d request failed\n", HP680_BTN_IRQ);
arch/sh/boards/mach-snapgear/setup.c +1 -1
@@ -41,7 +41,7 @@ static int __init eraseconfig_init(void) {printk ("SnapGear: EraseConfig init\n" );/* Setup "EraseConfig" switch on external IRQ 0 */ -if (request_irq (IRL0_IRQ , eraseconfig_interrupt,IRQF_DISABLED , +if (request_irq (IRL0_IRQ , eraseconfig_interrupt,0 ,"Erase Config" ,NULL ))printk ("SnapGear: failed to register IRQ%d for Reset witch\n" ,IRL0_IRQ );
arch/sh/drivers/dma/dma-g2.c +1 -1
@@ -170,7 +170,7 @@ static int __init g2_dma_init(void) {int ret; - ret =request_irq (HW_EVENT_G2_DMA , g2_dma_interrupt,IRQF_DISABLED , + ret =request_irq (HW_EVENT_G2_DMA , g2_dma_interrupt,0 ,"g2 DMA handler" , &g2_dma_info);if (unlikely (ret))return -EINVAL ;
arch/sh/drivers/dma/dma-pvr2.c +1 -1
@@ -70,7 +70,7 @@ static int pvr2_xfer_dma(struct dma_chanstatic struct irqaction pvr2_dma_irq = { .name ="pvr2 DMA handler" , .handler = pvr2_dma_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , };static struct dma_ops pvr2_dma_ops = {
arch/sh/drivers/dma/dma-sh.c +2 -2
@@ -94,7 +94,7 @@ static int sh_dmac_request_dma(struct dmreturn 0 ;return request_irq (get_dmte_irq (chan->chan), dma_tei, -IRQF_DISABLED , chan->dev_id, chan); +0 , chan->dev_id, chan); }static void sh_dmac_free_dma (struct dma_channel *chan)
@@ -265,7 +265,7 @@ static int __init sh_dmac_init(void)int i;#ifdef CONFIG_CPU_SH4 - i =request_irq (DMAE_IRQ , dma_err,IRQF_DISABLED ,"DMAC Address Error" ,0 ); + i =request_irq (DMAE_IRQ , dma_err,0 ,"DMAC Address Error" ,0 );if (unlikely (i <0 ))return i;#endif
arch/sh/drivers/dma/dmabrg.c +3 -3
@@ -173,17 +173,17 @@ static int __init dmabrg_init(void) or =ctrl_inl (DMAOR );ctrl_outl (or |DMAOR_BRG |DMAOR_DMEN ,DMAOR ); - ret =request_irq (DMABRGI0 , dmabrg_irq,IRQF_DISABLED , + ret =request_irq (DMABRGI0 , dmabrg_irq,0 ,"DMABRG USB address error" ,NULL );if (ret) goto out0; - ret =request_irq (DMABRGI1 , dmabrg_irq,IRQF_DISABLED , + ret =request_irq (DMABRGI1 , dmabrg_irq,0 ,"DMABRG Transfer End" ,NULL );if (ret) goto out1; - ret =request_irq (DMABRGI2 , dmabrg_irq,IRQF_DISABLED , + ret =request_irq (DMABRGI2 , dmabrg_irq,0 ,"DMABRG Transfer Half" ,NULL );if (ret ==0 )return ret;
arch/sh/drivers/pci/pci-sh5.c +2 -2
@@ -95,13 +95,13 @@ int __init sh5pci_init(unsigned long memu32 uval;if (request_irq (IRQ_ERR , pcish5_err_irq, -IRQF_DISABLED ,"PCI Error" ,NULL ) <0 ) { +0 ,"PCI Error" ,NULL ) <0 ) {printk (KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n" );return -EINVAL ; }if (request_irq (IRQ_SERR , pcish5_serr_irq, -IRQF_DISABLED ,"PCI SERR interrupt" ,NULL ) <0 ) { +0 ,"PCI SERR interrupt" ,NULL ) <0 ) {printk (KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n" );return -EINVAL ; }
arch/sh/drivers/push-switch.c +1 -1
@@ -62,7 +62,7 @@ static int switch_drv_probe(struct platfBUG_ON (!psw_info); ret =request_irq (irq, psw_info->irq_handler, -IRQF_DISABLED | psw_info->irq_flags, + psw_info->irq_flags, psw_info->name ? psw_info->name :DRV_NAME , pdev);if (unlikely (ret <0 )) goto err;
arch/sh/kernel/cpu/sh4a/smp-shx3.c +1 -1
@@ -61,7 +61,7 @@ void __init plat_prepare_cpus(unsigned iBUILD_BUG_ON (SMP_MSG_NR >=8 );for (i =0 ; i <SMP_MSG_NR ; i++) -request_irq (104 + i, ipi_interrupt_handler,IRQF_DISABLED , +request_irq (104 + i, ipi_interrupt_handler,0 ,"IPI" , (void *)(long )i); }
arch/sh/kernel/time_64.c +1 -1
@@ -283,7 +283,7 @@ static irqreturn_t timer_interrupt(int istatic struct irqaction irq0 = { .handler = timer_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .mask =CPU_MASK_NONE , .name ="timer" , };
arch/sh/kernel/timers/timer-cmt.c +1 -1
@@ -108,7 +108,7 @@ static irqreturn_t cmt_timer_interrupt(istatic struct irqaction cmt_irq = { .name ="timer" , .handler = cmt_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .mask =CPU_MASK_NONE , };
arch/sh/kernel/timers/timer-mtu2.c +1 -1
@@ -113,7 +113,7 @@ static irqreturn_t mtu2_timer_interrupt(static struct irqaction mtu2_irq = { .name ="timer" , .handler = mtu2_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .mask =CPU_MASK_NONE , };
arch/sh/kernel/timers/timer-tmu.c +1 -1
@@ -154,7 +154,7 @@ static irqreturn_t tmu_timer_interrupt(istatic struct irqaction tmu0_irq = { .name ="periodic/oneshot timer" , .handler = tmu_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .mask =CPU_MASK_NONE , };
arch/sparc/include/asm/floppy_32.h +1 -1
@@ -293,7 +293,7 @@ static int sun_fd_request_irq(void)if (!once) { once =1 ; error =sparc_floppy_request_irq (FLOPPY_IRQ , -IRQF_DISABLED , +0 , floppy_interrupt);return ((error ==0 ) ?0 :-1 ); }else return 0 ;
arch/sparc/include/asm/floppy_64.h +1 -1
@@ -258,7 +258,7 @@ static int sun_fd_request_irq(void) once =1 ; error =request_irq (FLOPPY_IRQ , sparc_floppy_irq, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL );return ((error ==0 ) ?0 :-1 ); }
arch/sparc/kernel/irq_32.c +2 -11
@@ -192,13 +192,9 @@ int show_interrupts(struct seq_file *p, kstat_cpu(j).irqs[i]); }#endif -seq_printf (p," %c %s" , - (action->flags &IRQF_DISABLED ) ?'+' :' ' , - action->name); +seq_printf (p," %c %s" ,'+' , action->name);for (action=action->next; action; action = action->next) { -seq_printf (p,",%s %s" , - (action->flags &IRQF_DISABLED ) ?" +" :"" , - action->name); +seq_printf (p,",%s %s" ,'+' , action->name); }seq_putc (p,'\n' ); }
@@ -544,11 +540,6 @@ int request_irq(unsigned int irq, ret = -EBUSY ; goto out_unlock; } -if ((action->flags &IRQF_DISABLED ) != (irqflags &IRQF_DISABLED )) { -printk ("Attempt to mix fast and slow interrupts on IRQ%d denied\n" , irq); - ret = -EBUSY ; - goto out_unlock; - }for ( ; action; action = *actionp) actionp = &action->next; }
arch/sparc/kernel/pcic.c +1 -1
@@ -738,7 +738,7 @@ void __init pci_time_init(void)writel (PCI_COUNTER_IRQ_SET (timer_irq,0 ), pcic->pcic_regs+PCI_COUNTER_IRQ ); irq =request_irq (timer_irq, pcic_timer_handler, - (IRQF_DISABLED |SA_STATIC_ALLOC ),"timer" ,NULL ); + (SA_STATIC_ALLOC ),"timer" ,NULL );if (irq) {prom_printf ("time_init: unable to attach IRQ%d\n" , timer_irq);prom_halt ();
arch/sparc/kernel/sun4c_irq.c +1 -1
@@ -175,7 +175,7 @@ static void __init sun4c_init_timers(irq master_l10_counter = &sun4c_timers->l10_count; err =request_irq (irq[0 ].pri, counter_fn, - (IRQF_DISABLED |SA_STATIC_ALLOC ), + (SA_STATIC_ALLOC ),"timer" ,NULL );if (err) {prom_printf ("sun4c_init_timers: request_irq() fails with %d\n" , err);
arch/sparc/kernel/sun4d_irq.c +3 -12
@@ -115,15 +115,11 @@ found_it: seq_printf(p, "%3d: ", i);seq_printf (p,"%10u " ,kstat_cpu (cpu_logical_map (x)).irqs[i]);#endif -seq_printf (p,"%c %s" , - (action->flags &IRQF_DISABLED ) ?'+' :' ' , - action->name); +seq_printf (p,"%c %s" ,'+' , action->name); action = action->next;for (;;) {for (; action; action = action->next) { -seq_printf (p,",%s %s" , - (action->flags &IRQF_DISABLED ) ?" +" :"" , - action->name); +seq_printf (p,",%s %s" ,'+' , action->name); }if (!sbusl)break ; k++;
@@ -297,11 +293,6 @@ int sun4d_request_irq(unsigned int irq, ret = -EBUSY ; goto out_unlock; } -if ((action->flags &IRQF_DISABLED ) ^ (irqflags &IRQF_DISABLED )) { -printk ("Attempt to mix fast and slow interrupts on IRQ%d denied\n" , irq); - ret = -EBUSY ; - goto out_unlock; - } action =NULL ;/* Or else! */ }
@@ -529,7 +520,7 @@ static void __init sun4d_init_timers(irq master_l10_counter = &sun4d_timers->l10_cur_count; err =request_irq (TIMER_IRQ , counter_fn, - (IRQF_DISABLED |SA_STATIC_ALLOC ), + (SA_STATIC_ALLOC ),"timer" ,NULL );if (err) {prom_printf ("sun4d_init_timers: request_irq() failed with %d\n" , err);
arch/sparc/kernel/sun4m_irq.c +1 -1
@@ -393,7 +393,7 @@ static void __init sun4m_init_timers(irq master_l10_counter = &timers_global->l10_count; err =request_irq (TIMER_IRQ , counter_fn, - (IRQF_DISABLED |SA_STATIC_ALLOC ),"timer" ,NULL ); + (SA_STATIC_ALLOC ),"timer" ,NULL );if (err) {printk (KERN_ERR "sun4m_init_timers: Register IRQ error %d.\n" , err);
arch/um/drivers/line.c +2 -2
@@ -371,7 +371,7 @@ static irqreturn_t line_write_interrupt(int line_setup_irq (int fd,int input,int output,struct line *line,void *data) {const struct line_driver *driver = line->driver; -int err =0 , flags =IRQF_DISABLED |IRQF_SHARED |IRQF_SAMPLE_RANDOM ; +int err =0 , flags =IRQF_SHARED |IRQF_SAMPLE_RANDOM ;if (input) err = um_request_irq(driver->read_irq, fd, IRQ_READ,
@@ -795,7 +795,7 @@ void register_winch_irq(int fd, int tty_ .stack = stack });if (um_request_irq (WINCH_IRQ , fd,IRQ_READ , winch_interrupt, -IRQF_DISABLED |IRQF_SHARED |IRQF_SAMPLE_RANDOM , +IRQF_SHARED |IRQF_SAMPLE_RANDOM ,"winch" , winch) <0 ) {printk (KERN_ERR "register_winch_irq - failed to register " "IRQ\n" );
arch/um/drivers/mconsole_kern.c +1 -1
@@ -805,7 +805,7 @@ static int __init mconsole_init(void)register_reboot_notifier (&reboot_notifier); err =um_request_irq (MCONSOLE_IRQ , sock,IRQ_READ , mconsole_interrupt, -IRQF_DISABLED |IRQF_SHARED |IRQF_SAMPLE_RANDOM , +IRQF_SHARED |IRQF_SAMPLE_RANDOM ,"mconsole" , (void *)sock);if (err) {printk (KERN_ERR "Failed to get IRQ for management console\n" );
arch/um/drivers/net_kern.c +1 -1
@@ -165,7 +165,7 @@ static int uml_net_open(struct net_devic } err =um_request_irq (dev->irq, lp->fd,IRQ_READ , uml_net_interrupt, -IRQF_DISABLED |IRQF_SHARED , dev->name, dev); +IRQF_SHARED , dev->name, dev);if (err !=0 ) {printk (KERN_ERR "uml_net_open: failed to get irq(%d)\n" , err); err = -ENETUNREACH ;
arch/um/drivers/port_kern.c +2 -2
@@ -98,7 +98,7 @@ static int port_accept(struct port_list .port = port });if (um_request_irq (TELNETD_IRQ , socket[0 ],IRQ_READ , pipe_interrupt, -IRQF_DISABLED |IRQF_SHARED |IRQF_SAMPLE_RANDOM , +IRQF_SHARED |IRQF_SAMPLE_RANDOM ,"telnetd" , conn)) {printk (KERN_ERR "port_accept : failed to get IRQ for " "telnetd\n" );
@@ -182,7 +182,7 @@ void *port_data(int port_num) }if (um_request_irq (ACCEPT_IRQ , fd,IRQ_READ , port_interrupt, -IRQF_DISABLED |IRQF_SHARED |IRQF_SAMPLE_RANDOM , +IRQF_SHARED |IRQF_SAMPLE_RANDOM ,"port" , port)) {printk (KERN_ERR "Failed to get IRQ for port %d\n" , port_num); goto out_close;
arch/um/drivers/random.c +1 -1
@@ -133,7 +133,7 @@ static int __init rng_init (void) random_fd = err; err =um_request_irq (RANDOM_IRQ , random_fd,IRQ_READ , random_interrupt, -IRQF_DISABLED |IRQF_SAMPLE_RANDOM ,"random" , +IRQF_SAMPLE_RANDOM ,"random" ,NULL );if (err) goto err_out_cleanup_hw;
arch/um/drivers/ubd_kern.c +1 -1
@@ -1104,7 +1104,7 @@ static int __init ubd_driver_init(void){return 0 ; } err =um_request_irq (UBD_IRQ , thread_fd,IRQ_READ , ubd_intr, -IRQF_DISABLED ,"ubd" , ubd_devs); +0 ,"ubd" , ubd_devs);if (err !=0 )printk (KERN_ERR "um_request_irq failed - errno = %d\n" , -err);return 0 ;
arch/um/drivers/xterm_kern.c +1 -1
@@ -50,7 +50,7 @@ int xterm_fd(int socket, int *pid_out)init_completion (&data->ready); err =um_request_irq (XTERM_IRQ , socket,IRQ_READ , xterm_interrupt, -IRQF_DISABLED |IRQF_SHARED |IRQF_SAMPLE_RANDOM , +IRQF_SHARED |IRQF_SAMPLE_RANDOM ,"xterm" , data);if (err) { printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
arch/um/kernel/sigio.c +1 -1
@@ -25,7 +25,7 @@ int write_sigio_irq(int fd)int err; err =um_request_irq (SIGIO_WRITE_IRQ , fd,IRQ_READ , sigio_interrupt, -IRQF_DISABLED |IRQF_SAMPLE_RANDOM ,"write sigio" , +IRQF_SAMPLE_RANDOM ,"write sigio" ,NULL );if (err) { printk(KERN_ERR "write_sigio_irq : um_request_irq failed, "
arch/um/kernel/time.c +1 -1
@@ -84,7 +84,7 @@ static void __init setup_itimer(void) {int err; - err =request_irq (TIMER_IRQ , um_timer,IRQF_DISABLED ,"timer" ,NULL ); + err =request_irq (TIMER_IRQ , um_timer,0 ,"timer" ,NULL );if (err !=0 )printk (KERN_ERR "register_timer : request_irq failed - " "errno = %d\n" , -err);
arch/x86/include/asm/floppy.h +2 -2
@@ -145,10 +145,10 @@ static int fd_request_irq(void) {if (can_use_virtual_dma)return request_irq (FLOPPY_IRQ , floppy_hardint, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL );else return request_irq (FLOPPY_IRQ , floppy_interrupt, -IRQF_DISABLED ,"floppy" ,NULL ); +0 ,"floppy" ,NULL ); }static unsigned long dma_mem_alloc (unsigned long size)
arch/x86/kernel/hpet.c +1 -1
@@ -494,7 +494,7 @@ static int hpet_setup_irq(struct hpet_de {if (request_irq (dev->irq, hpet_interrupt_handler, -IRQF_DISABLED |IRQF_NOBALANCING , dev->name, dev)) +IRQF_NOBALANCING , dev->name, dev))return -1 ;disable_irq (dev->irq);
arch/x86/kernel/mfgpt_32.c +1 -1
@@ -347,7 +347,7 @@ static irqreturn_t mfgpt_tick(int irq, vstatic struct irqaction mfgptirq = { .handler = mfgpt_tick, - .flags =IRQF_DISABLED |IRQF_NOBALANCING , + .flags =IRQF_NOBALANCING , .mask =CPU_MASK_NONE , .name ="mfgpt-timer" };
arch/x86/kernel/setup.c +1 -1
@@ -1025,7 +1025,7 @@ void __init x86_quirk_trap_init(void)static struct irqaction irq0 = { .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_NOBALANCING |IRQF_IRQPOLL |IRQF_TIMER , + .flags =IRQF_NOBALANCING |IRQF_IRQPOLL |IRQF_TIMER , .mask =CPU_MASK_NONE , .name ="timer" };
arch/x86/kernel/time_64.c +1 -1
@@ -115,7 +115,7 @@ unsigned long __init calibrate_cpu(void)static struct irqaction irq0 = { .handler = timer_interrupt, - .flags =IRQF_DISABLED |IRQF_IRQPOLL |IRQF_NOBALANCING |IRQF_TIMER , + .flags =IRQF_IRQPOLL |IRQF_NOBALANCING |IRQF_TIMER , .mask =CPU_MASK_NONE , .name ="timer" };
arch/x86/kernel/vmiclock_32.c +1 -1
@@ -201,7 +201,7 @@ static irqreturn_t vmi_timer_interrupt(istatic struct irqaction vmi_clock_action = { .name ="vmi-timer" , .handler = vmi_timer_interrupt, - .flags =IRQF_DISABLED |IRQF_NOBALANCING |IRQF_TIMER , + .flags =IRQF_NOBALANCING |IRQF_TIMER , .mask =CPU_MASK_ALL , };
arch/x86/xen/smp.c +4 -4
@@ -98,7 +98,7 @@ static int xen_smp_intr_init(unsigned in rc =bind_ipi_to_irqhandler (XEN_RESCHEDULE_VECTOR , cpu, xen_reschedule_interrupt, -IRQF_DISABLED |IRQF_PERCPU |IRQF_NOBALANCING , +IRQF_PERCPU |IRQF_NOBALANCING , resched_name,NULL );if (rc <0 )
@@ -109,7 +109,7 @@ static int xen_smp_intr_init(unsigned in rc =bind_ipi_to_irqhandler (XEN_CALL_FUNCTION_VECTOR , cpu, xen_call_function_interrupt, -IRQF_DISABLED |IRQF_PERCPU |IRQF_NOBALANCING , +IRQF_PERCPU |IRQF_NOBALANCING , callfunc_name,NULL );if (rc <0 )
@@ -118,7 +118,7 @@ static int xen_smp_intr_init(unsigned in debug_name =kasprintf (GFP_KERNEL ,"debug%d" , cpu); rc =bind_virq_to_irqhandler (VIRQ_DEBUG , cpu, xen_debug_interrupt, -IRQF_DISABLED |IRQF_PERCPU |IRQF_NOBALANCING , +IRQF_PERCPU |IRQF_NOBALANCING , debug_name,NULL );if (rc <0 ) goto fail;
@@ -128,7 +128,7 @@ static int xen_smp_intr_init(unsigned in rc =bind_ipi_to_irqhandler (XEN_CALL_FUNCTION_SINGLE_VECTOR , cpu, xen_call_function_single_interrupt, -IRQF_DISABLED |IRQF_PERCPU |IRQF_NOBALANCING , +IRQF_PERCPU |IRQF_NOBALANCING , callfunc_name,NULL );if (rc <0 )
arch/x86/xen/spinlock.c +1 -1
@@ -345,7 +345,7 @@ void __cpuinit xen_init_lock_cpu(int cpu irq =bind_ipi_to_irqhandler (XEN_SPIN_UNLOCK_VECTOR , cpu, dummy_handler, -IRQF_DISABLED |IRQF_PERCPU |IRQF_NOBALANCING , +IRQF_PERCPU |IRQF_NOBALANCING , name,NULL );
arch/x86/xen/time.c +1 -1
@@ -429,7 +429,7 @@ void xen_setup_timer(int cpu) name ="<timer kasprintf failed>" ; irq =bind_virq_to_irqhandler (VIRQ_TIMER , cpu, xen_timer_interrupt, -IRQF_DISABLED |IRQF_PERCPU |IRQF_NOBALANCING , +IRQF_PERCPU |IRQF_NOBALANCING , name,NULL ); evt = &per_cpu (xen_clock_events, cpu);
arch/xtensa/kernel/time.c +1 -1
@@ -49,7 +49,7 @@ unsigned long long sched_clock(void)static irqreturn_t timer_interrupt (int irq,void *dev_id);static struct irqaction timer_irqaction = { .handler = timer_interrupt, - .flags =IRQF_DISABLED , + .flags =0 , .name ="timer" , };
drivers/ata/pata_mpc52xx.c +1 -1
@@ -780,7 +780,7 @@ mpc52xx_ata_probe(struct of_device *op, } task_irq =bcom_get_task_irq (dmatsk); - ret =request_irq (task_irq, &mpc52xx_ata_task_irq,IRQF_DISABLED , + ret =request_irq (task_irq, &mpc52xx_ata_task_irq,0 ,"ATA task" , priv);if (ret) {dev_err (&op->dev,"error requesting DMA IRQ\n" );
drivers/atm/he.c +1 -1
@@ -960,7 +960,7 @@ he_init_irq(struct he_dev *he_dev)he_writel (he_dev,0x0 ,GRP_54_MAP );he_writel (he_dev,0x0 ,GRP_76_MAP ); -if (request_irq (he_dev->pci_dev->irq, he_irq_handler,IRQF_DISABLED |IRQF_SHARED ,DEV_LABEL , he_dev)) { +if (request_irq (he_dev->pci_dev->irq, he_irq_handler,IRQF_SHARED ,DEV_LABEL , he_dev)) {hprintk ("irq %d already in use\n" , he_dev->pci_dev->irq);return -EINVAL ; }
drivers/atm/idt77252.c +1 -1
@@ -3363,7 +3363,7 @@ init_card(struct atm_dev *dev)writel (SAR_STAT_TMROF ,SAR_REG_STAT ); }IPRINTK ("%s: Request IRQ ... " , card->name); -if (request_irq (pcidev->irq, idt77252_interrupt,IRQF_DISABLED |IRQF_SHARED , +if (request_irq (pcidev->irq, idt77252_interrupt,IRQF_SHARED , card->name, card) !=0 ) {printk ("%s: can't allocate IRQ.\n" , card->name);deinit_card (card);
drivers/atm/nicstar.c +1 -1
@@ -780,7 +780,7 @@ static int __devinit ns_init_card(int i, card->efbie =1 ; card->intcnt =0 ; -if (request_irq (pcidev->irq, &ns_irq_handler,IRQF_DISABLED |IRQF_SHARED ,"nicstar" , card) !=0 ) +if (request_irq (pcidev->irq, &ns_irq_handler,IRQF_SHARED ,"nicstar" , card) !=0 ) {printk ("nicstar%d: can't allocate IRQ %d.\n" , i, pcidev->irq); error =9 ;
drivers/atm/solos-pci.c +1 -1
@@ -668,7 +668,7 @@ static int fpga_probe(struct pci_dev *de} */ //dev_dbg(&card->dev->dev, "Requesting IRQ: %d\n",dev->irq); - err =request_irq (dev->irq, solos_irq,IRQF_DISABLED |IRQF_SHARED , + err =request_irq (dev->irq, solos_irq,IRQF_SHARED ,"solos-pci" , card);if (err)dev_dbg (&card->dev->dev,"Failed to request interrupt IRQ: %d\n" , dev->irq);
drivers/block/cciss.c +1 -1
@@ -3669,7 +3669,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, -IRQF_DISABLED |IRQF_SHARED , hba[i]->devname, hba[i])) { +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;
drivers/block/cpqarray.c +1 -1
@@ -407,7 +407,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, -IRQF_DISABLED |IRQF_SHARED , hba[i]->devname, hba[i])) +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);
drivers/block/hd.c +1 -1
@@ -762,7 +762,7 @@ static int __init hd_init(void) p->cyl, p->head, p->sect); } -if (request_irq (HD_IRQ , hd_interrupt,IRQF_DISABLED ,"hd" ,NULL )) { +if (request_irq (HD_IRQ , hd_interrupt,0 ,"hd" ,NULL )) {printk ("hd: unable to get IRQ%d for the hard disk driver\n" ,HD_IRQ ); goto out1;
drivers/cdrom/gdrom.c +2 -2
@@ -545,11 +545,11 @@ static int __devinit gdrom_set_interruptint err; err =request_irq (HW_EVENT_GDROM_CMD , gdrom_command_interrupt, -IRQF_DISABLED ,"gdrom_command" , &gd); +0 ,"gdrom_command" , &gd);if (err)return err; err =request_irq (HW_EVENT_GDROM_DMA , gdrom_dma_interrupt, -IRQF_DISABLED ,"gdrom_dma" , &gd); +0 ,"gdrom_dma" , &gd);if (err)free_irq (HW_EVENT_GDROM_CMD , &gd);return err;
drivers/char/amiserial.c +1 -1
@@ -2033,7 +2033,7 @@ static int __init rs_init(void)if (error) goto fail_unregister; - error =request_irq (IRQ_AMIGA_RBF , ser_rx_int,IRQF_DISABLED , + error =request_irq (IRQ_AMIGA_RBF , ser_rx_int,0 ,"serial RX" , state);if (error) goto fail_free_irq;
drivers/char/cyclades.c +1 -1
@@ -4611,7 +4611,7 @@ static int __init cy_detect_isa(void)/* allocate IRQ */ if (request_irq (cy_isa_irq, cyy_interrupt, -IRQF_DISABLED ,"Cyclom-Y" , &cy_card[j])) { +0 ,"Cyclom-Y" , &cy_card[j])) {printk (KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but " "could not allocate IRQ#%d.\n" , (unsigned long )cy_isa_address, cy_isa_irq);
drivers/char/hpet.c +1 -2
@@ -478,8 +478,7 @@ static int hpet_ioctl_ieon(struct hpet_dunsigned long irq_flags;sprintf (devp->hd_name,"hpet%d" , (int )(devp - hpetp->hp_dev)); - irq_flags = devp->hd_flags &HPET_SHARED_IRQ - ?IRQF_SHARED :IRQF_DISABLED ; + irq_flags = devp->hd_flags &HPET_SHARED_IRQ ?IRQF_SHARED :0 ;if (request_irq (irq, hpet_interrupt, irq_flags, devp->hd_name, (void *)devp)) {printk (KERN_ERR "hpet: IRQ %d is not free\n" , irq);
drivers/char/hvc_irq.c +1 -1
@@ -28,7 +28,7 @@ int notifier_add_irq(struct hvc_struct * hp->irq_requested =0 ;return 0 ; } - rc =request_irq (irq, hvc_handle_interrupt,IRQF_DISABLED , + rc =request_irq (irq, hvc_handle_interrupt,0 ,"hvc_console" , hp);if (!rc) hp->irq_requested =1 ;
drivers/char/hvcs.c +1 -1
@@ -1047,7 +1047,7 @@ static int hvcs_enable_device(struct hvc* the conn was registered and now. */ if (!(rc =request_irq (irq, &hvcs_handle_interrupt, -IRQF_DISABLED ,"ibmhvcs" , hvcsd))) { +0 ,"ibmhvcs" , hvcsd))) {/* * It is possible the vty-server was removed after the irq was * requested but before we have time to enable interrupts.
drivers/char/hvsi.c +1 -1
@@ -1169,7 +1169,7 @@ static int __init hvsi_init(void)struct hvsi_struct *hp = &hvsi_ports[i];int ret =1 ; - ret =request_irq (hp->virq, hvsi_interrupt,IRQF_DISABLED ,"hvsi" , hp); + ret =request_irq (hp->virq, hvsi_interrupt,0 ,"hvsi" , hp);if (ret)printk (KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n" , hp->virq, ret);
drivers/char/ipmi/ipmi_si_intf.c +2 -2
@@ -1233,7 +1233,7 @@ static int std_irq_setup(struct smi_infoif (info->si_type ==SI_BT ) { rv =request_irq (info->irq, si_bt_irq_handler, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,DEVICE_NAME , info);if (!rv)
@@ -1243,7 +1243,7 @@ static int std_irq_setup(struct smi_info }else rv =request_irq (info->irq, si_irq_handler, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,DEVICE_NAME , info);if (rv) {
drivers/char/isicom.c +1 -1
@@ -1624,7 +1624,7 @@ static int __devinit isicom_probe(struct } retval =request_irq (board->irq, isicom_interrupt, -IRQF_SHARED |IRQF_DISABLED ,ISICOM_NAME , board); +IRQF_SHARED ,ISICOM_NAME , board);if (retval <0 ) {dev_err (&pdev->dev,"Could not install handler at Irq %d. " "Card%d will be disabled.\n" , board->irq, index +1 );
drivers/char/nwbutton.c +1 -1
@@ -219,7 +219,7 @@ static int __init nwbutton_init(void)return -EBUSY ; } -if (request_irq (IRQ_NETWINDER_BUTTON , button_handler,IRQF_DISABLED , +if (request_irq (IRQ_NETWINDER_BUTTON , button_handler,0 ,"nwbutton" ,NULL )) {printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n" ,IRQ_NETWINDER_BUTTON );
drivers/char/riscom8.c +1 -1
@@ -597,7 +597,7 @@ static int rc_setup_board(struct riscom_if (bp->flags &RC_BOARD_ACTIVE )return 0 ; - error =request_irq (bp->irq, rc_interrupt,IRQF_DISABLED , + error =request_irq (bp->irq, rc_interrupt,0 ,"RISCom/8" , bp);if (error)return error;
drivers/char/rtc.c +1 -1
@@ -1044,7 +1044,7 @@ no_irq: rtc_int_handler_ptr = rtc_interrupt; } -if (request_irq (RTC_IRQ , rtc_int_handler_ptr,IRQF_DISABLED , +if (request_irq (RTC_IRQ , rtc_int_handler_ptr,0 ,"rtc" ,NULL )) {/* Yeah right, seeing as irq 8 doesn't even hit the bus. */ rtc_has_irq =0 ;
drivers/char/snsc.c +1 -1
@@ -107,7 +107,7 @@ scdrv_open(struct inode *inode, struct f/* hook this subchannel up to the system controller interrupt */ lock_kernel (); rv =request_irq (SGI_UART_VECTOR , scdrv_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,SYSCTL_BASENAME , sd);if (rv) {ia64_sn_irtr_close (sd->sd_nasid, sd->sd_subch);
drivers/char/snsc_event.c +1 -1
@@ -291,7 +291,7 @@ scdrv_event_init(struct sysctl_data_s *s/* hook event subchannel up to the system controller interrupt */ rv =request_irq (SGI_UART_VECTOR , scdrv_event_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,"system controller events" , event_sd);if (rv) { printk(KERN_WARNING "%s: irq request failed (%d)\n",
drivers/char/specialix.c +2 -2
@@ -909,10 +909,10 @@ static int sx_setup_board(struct specialif (bp->flags &SX_BOARD_IS_PCI ) error =request_irq (bp->irq, sx_interrupt, -IRQF_DISABLED |IRQF_SHARED ,"specialix IO8+" , bp); +IRQF_SHARED ,"specialix IO8+" , bp);else error =request_irq (bp->irq, sx_interrupt, -IRQF_DISABLED ,"specialix IO8+" , bp); +0 ,"specialix IO8+" , bp);if (error)return error;
drivers/char/sx.c +2 -2
@@ -2096,7 +2096,7 @@ static int sx_init_board(struct sx_board/* fixed irq, probably PCI */ if (sx_irqmask & (1 << board->irq)) {/* may we use this irq? */ if (request_irq (board->irq, sx_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,"sx" , board)) {printk (KERN_ERR "sx: Cannot allocate " "irq %d.\n" , board->irq);
@@ -2112,7 +2112,7 @@ static int sx_init_board(struct sx_boardfor (irqnr =15 ; irqnr >0 ; irqnr--)if (irqmask & (1 << irqnr))if (!request_irq (irqnr, sx_interrupt, -IRQF_SHARED |IRQF_DISABLED , +IRQF_SHARED ,"sx" , board))break ;if (!irqnr)
drivers/char/tlclk.c +1 -1
@@ -221,7 +221,7 @@ static int tlclk_open(struct inode *inod/* This device is wired through the FPGA IO space of the ATCA blade * we can't share this IRQ */ result =request_irq (telclk_interrupt, &tlclk_interrupt, -IRQF_DISABLED ,"telco_clock" , tlclk_interrupt); +0 ,"telco_clock" , tlclk_interrupt);if (result == -EBUSY )printk (KERN_ERR "tlclk: Interrupt can't be reserved.\n" );else
drivers/char/vme_scc.c +24 -24
144 lines not on this page · raw message
drivers/clocksource/tcb_clksrc.c +1 -1
@@ -175,7 +175,7 @@ static irqreturn_t ch2_irq(int irq, voidstatic struct irqaction tc_irqaction = { .name ="tc_clkevt" , - .flags =IRQF_TIMER |IRQF_DISABLED , + .flags =IRQF_TIMER , .handler = ch2_irq, };
drivers/edac/mpc85xx_edac.c +3 -3
@@ -273,7 +273,7 @@ static int __devinit mpc85xx_pci_err_proif (edac_op_state ==EDAC_OPSTATE_INT ) { pdata->irq =irq_of_parse_and_map (op->node,0 ); res =devm_request_irq (&op->dev, pdata->irq, - mpc85xx_pci_isr,IRQF_DISABLED , + mpc85xx_pci_isr,0 ,"[EDAC] PCI err" , pci);if (res <0 ) { printk(KERN_ERR
@@ -577,7 +577,7 @@ static int __devinit mpc85xx_l2_err_probif (edac_op_state ==EDAC_OPSTATE_INT ) { pdata->irq =irq_of_parse_and_map (op->node,0 ); res =devm_request_irq (&op->dev, pdata->irq, - mpc85xx_l2_isr,IRQF_DISABLED , + mpc85xx_l2_isr,0 ,"[EDAC] L2 err" , edac_dev);if (res <0 ) { printk(KERN_ERR
@@ -912,7 +912,7 @@ static int __devinit mpc85xx_mc_err_prob pdata->irq =irq_of_parse_and_map (op->node,0 ); res =devm_request_irq (&op->dev, pdata->irq, mpc85xx_mc_isr, -IRQF_DISABLED |IRQF_SHARED , +IRQF_SHARED ,"[EDAC] MC err" , mci);if (res <0 ) { printk(KERN_ERR "%s: Unable to request irq %d for "
drivers/edac/mv64x60_edac.c +4 -4
@@ -178,7 +178,7 @@ static int __devinit mv64x60_pci_err_pro res =devm_request_irq (&pdev->dev, pdata->irq, mv64x60_pci_isr, -IRQF_DISABLED , +0 ,"[EDAC] PCI err" , pci);if (res <0 ) {
@@ -345,7 +345,7 @@ static int __devinit mv64x60_sram_err_pr res =devm_request_irq (&pdev->dev, pdata->irq, mv64x60_sram_isr, -IRQF_DISABLED , +0 ,"[EDAC] SRAM err" , edac_dev);if (res <0 ) {
@@ -540,7 +540,7 @@ static int __devinit mv64x60_cpu_err_pro res =devm_request_irq (&pdev->dev, pdata->irq, mv64x60_cpu_isr, -IRQF_DISABLED , +0 ,"[EDAC] CPU err" , edac_dev);if (res <0 ) {
@@ -785,7 +785,7 @@ static int __devinit mv64x60_mc_err_prob res =devm_request_irq (&pdev->dev, pdata->irq, mv64x60_mc_isr, -IRQF_DISABLED , +0 ,"[EDAC] MC err" , mci);if (res <0 ) {
drivers/i2c/busses/i2c-bfin-twi.c +2 -2
@@ -593,7 +593,7 @@ static int i2c_bfin_twi_resume(struct plstruct bfin_twi_iface *iface =platform_get_drvdata (pdev);int rc =request_irq (iface->irq, bfin_twi_interrupt_entry, -IRQF_DISABLED , pdev->name, iface); +0 , pdev->name, iface);if (rc) {dev_err (&pdev->dev,"Can't get IRQ %d !\n" , iface->irq);return -ENODEV ;
@@ -665,7 +665,7 @@ static int i2c_bfin_twi_probe(struct pla } rc =request_irq (iface->irq, bfin_twi_interrupt_entry, -IRQF_DISABLED , pdev->name, iface); +0 , pdev->name, iface);if (rc) {dev_err (&pdev->dev,"Can't get IRQ %d !\n" , iface->irq); rc = -ENODEV ;
drivers/i2c/busses/i2c-highlander.c +1 -1
@@ -387,7 +387,7 @@ static int __devinit highlander_i2c_prob dev->irq =0 ;if (dev->irq) { - ret =request_irq (dev->irq, highlander_i2c_irq,IRQF_DISABLED , + ret =request_irq (dev->irq, highlander_i2c_irq,0 , pdev->name, dev);if (unlikely (ret)) goto err_unmap;
drivers/i2c/busses/i2c-pmcmsp.c +1 -1
@@ -306,7 +306,7 @@ static int __devinit pmcmsptwi_probe(str pmcmsptwi_data.irq =platform_get_irq (pldev,0 );if (pmcmsptwi_data.irq) { rc =request_irq (pmcmsptwi_data.irq, &pmcmsptwi_interrupt, -IRQF_SHARED |IRQF_DISABLED |IRQF_SAMPLE_RANDOM , +IRQF_SHARED |IRQF_SAMPLE_RANDOM , pldev->name, &pmcmsptwi_data);if (rc ==0 ) {/*
drivers/i2c/busses/i2c-pxa.c +1 -1
@@ -1055,7 +1055,7 @@ static int i2c_pxa_probe(struct platform i2c->adap.algo = &i2c_pxa_pio_algorithm; }else { i2c->adap.algo = &i2c_pxa_algorithm; - ret =request_irq (irq, i2c_pxa_handler,IRQF_DISABLED , + ret =request_irq (irq, i2c_pxa_handler,0 , i2c->adap.name, i2c);if (ret) goto ereqirq;
drivers/i2c/busses/i2c-s3c2410.c +1 -1
@@ -876,7 +876,7 @@ static int s3c24xx_i2c_probe(struct plat goto err_iomap; } - ret =request_irq (i2c->irq, s3c24xx_i2c_irq,IRQF_DISABLED , + ret =request_irq (i2c->irq, s3c24xx_i2c_irq,0 ,dev_name (&pdev->dev), i2c);if (ret !=0 ) {
drivers/i2c/busses/i2c-sh7760.c +1 -1
@@ -502,7 +502,7 @@ static int __devinit sh7760_i2c_probe(st }OUT32 (id,I2CCCR , ret); -if (request_irq (id->irq, sh7760_i2c_irq,IRQF_DISABLED , +if (request_irq (id->irq, sh7760_i2c_irq,0 ,SH7760_I2C_DEVNAME , id)) {dev_err (&pdev->dev,"cannot get irq %d\n" , id->irq); ret = -EBUSY ;
drivers/i2c/busses/i2c-sh_mobile.c +1 -1
@@ -499,7 +499,7 @@ static int sh_mobile_i2c_hook_irqs(strucwhile ((res =platform_get_resource (dev,IORESOURCE_IRQ , k))) {for (n = res->start; hook && n <= res->end; n++) { -if (request_irq (n, sh_mobile_i2c_isr,IRQF_DISABLED , +if (request_irq (n, sh_mobile_i2c_isr,0 ,dev_name (&dev->dev), dev)) goto rollback; }
drivers/infiniband/hw/ehca/ehca_eq.c +2 -2
@@ -123,7 +123,7 @@ int ehca_create_eq(struct ehca_shca *shc/* register interrupt handlers and initialize work queues */ if (type ==EHCA_EQ ) { ret =ibmebus_request_irq (eq->ist, ehca_interrupt_eq, -IRQF_DISABLED ,"ehca_eq" , +0 ,"ehca_eq" , (void *)shca);if (ret <0 )ehca_err (ib_dev,"Can't map interrupt handler." );
@@ -131,7 +131,7 @@ int ehca_create_eq(struct ehca_shca *shctasklet_init (&eq->interrupt_task, ehca_tasklet_eq, (long )shca); }else if (type ==EHCA_NEQ ) { ret =ibmebus_request_irq (eq->ist, ehca_interrupt_neq, -IRQF_DISABLED ,"ehca_neq" , +0 ,"ehca_neq" , (void *)shca);if (ret <0 )ehca_err (ib_dev,"Can't map interrupt handler." );
drivers/input/keyboard/corgikbd.c +1 -1
@@ -349,7 +349,7 @@ static int __init corgikbd_probe(structfor (i =0 ; i <CORGI_KEY_SENSE_NUM ; i++) {pxa_gpio_mode (CORGI_GPIO_KEY_SENSE (i) |GPIO_IN );if (request_irq (CORGI_IRQ_GPIO_KEY_SENSE (i), corgikbd_interrupt, -IRQF_DISABLED |IRQF_TRIGGER_RISING , +IRQF_TRIGGER_RISING ,"corgikbd" , corgikbd))printk (KERN_WARNING "corgikbd: Can't get IRQ: %d!\n" , i); }
drivers/input/keyboard/jornada720_kbd.c +1 -1
@@ -128,7 +128,7 @@ static int __devinit jornada720_kbd_prob err =request_irq (IRQ_GPIO0 , jornada720_kbd_interrupt, -IRQF_DISABLED |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_FALLING ,"jornadakbd" , pdev);if (err) {printk (KERN_INFO "jornadakbd720_kbd: Unable to grab IRQ\n" );
drivers/input/keyboard/pxa27x_keypad.c +1 -1
@@ -510,7 +510,7 @@ static int __devinit pxa27x_keypad_probepxa27x_keypad_build_keycode (keypad);platform_set_drvdata (pdev, keypad); - error =request_irq (irq, pxa27x_keypad_irq_handler,IRQF_DISABLED , + error =request_irq (irq, pxa27x_keypad_irq_handler,0 , pdev->name, keypad);if (error) {dev_err (&pdev->dev,"failed to request IRQ\n" );
drivers/input/keyboard/pxa930_rotary.c +1 -1
@@ -147,7 +147,7 @@ static int __devinit pxa930_rotary_probe r->input_dev = input_dev;input_set_drvdata (input_dev, r); - err =request_irq (irq, rotary_irq,IRQF_DISABLED , + err =request_irq (irq, rotary_irq,0 ,"enhanced rotary" , r);if (err) {dev_err (&pdev->dev,"failed to request IRQ\n" );
drivers/input/keyboard/spitzkbd.c +6 -6
@@ -407,7 +407,7 @@ static int __init spitzkbd_probe(structfor (i =0 ; i <SPITZ_KEY_SENSE_NUM ; i++) {pxa_gpio_mode (spitz_senses[i] |GPIO_IN );if (request_irq (IRQ_GPIO (spitz_senses[i]), spitzkbd_interrupt, -IRQF_DISABLED |IRQF_TRIGGER_RISING , +IRQF_TRIGGER_RISING ,"Spitzkbd Sense" , spitzkbd))printk (KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n" , i); }
@@ -422,19 +422,19 @@ static int __init spitzkbd_probe(structpxa_gpio_mode (SPITZ_GPIO_SWB |GPIO_IN );request_irq (SPITZ_IRQ_GPIO_SYNC , spitzkbd_interrupt, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"Spitzkbd Sync" , spitzkbd);request_irq (SPITZ_IRQ_GPIO_ON_KEY , spitzkbd_interrupt, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"Spitzkbd PwrOn" , spitzkbd);request_irq (SPITZ_IRQ_GPIO_SWA , spitzkbd_hinge_isr, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"Spitzkbd SWA" , spitzkbd);request_irq (SPITZ_IRQ_GPIO_SWB , spitzkbd_hinge_isr, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"Spitzkbd SWB" , spitzkbd);request_irq (SPITZ_IRQ_GPIO_AK_INT , spitzkbd_hinge_isr, -IRQF_DISABLED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"Spitzkbd HP" , spitzkbd);return 0 ;
drivers/input/keyboard/tosakbd.c +1 -1
@@ -317,7 +317,7 @@ static int __devinit tosakbd_probe(struc } error =request_irq (irq, tosakbd_interrupt, -IRQF_DISABLED |IRQF_TRIGGER_RISING , +IRQF_TRIGGER_RISING ,"tosakbd" , pdev);if (error) {
drivers/input/misc/ixp4xx-beeper.c +1 -1
@@ -115,7 +115,7 @@ static int __devinit ixp4xx_spkr_probe(s input_dev->event = ixp4xx_spkr_event; err =request_irq (IRQ_IXP4XX_TIMER2 , &ixp4xx_spkr_interrupt, -IRQF_DISABLED |IRQF_TIMER ,"ixp4xx-beeper" , (void *) dev->id); +IRQF_TIMER ,"ixp4xx-beeper" , (void *) dev->id);if (err) goto err_free_device;
drivers/input/mouse/pxa930_trkball.c +1 -1
@@ -183,7 +183,7 @@ static int __devinit pxa930_trkball_prob/* held the module in reset, will be enabled in open() */ pxa930_trkball_disable (trkball); - error =request_irq (irq, pxa930_trkball_interrupt,IRQF_DISABLED , + error =request_irq (irq, pxa930_trkball_interrupt,0 , pdev->name, trkball);if (error) {dev_err (&pdev->dev,"failed to request irq: %d\n" , error);
drivers/input/touchscreen/atmel_tsadcc.c +1 -1
@@ -218,7 +218,7 @@ static int __devinit atmel_tsadcc_probe( goto err_release_mem; } - err =request_irq (ts_dev->irq, atmel_tsadcc_interrupt,IRQF_DISABLED , + err =request_irq (ts_dev->irq, atmel_tsadcc_interrupt,0 , pdev->dev.driver->name, ts_dev);if (err) {dev_err (&pdev->dev,"failed to allocate irq.\n" );
drivers/input/touchscreen/corgi_ts.c +1 -1
@@ -321,7 +321,7 @@ static int __init corgits_probe(struct pcorgi_ssp_ads7846_putget ((5u <<ADSCTRL_ADR_SH ) |ADSCTRL_STS );mdelay (5 ); -if (request_irq (corgi_ts->irq_gpio, ts_interrupt,IRQF_DISABLED ,"ts" , corgi_ts)) { +if (request_irq (corgi_ts->irq_gpio, ts_interrupt,0 ,"ts" , corgi_ts)) { err = -EBUSY ; goto fail1; }
drivers/input/touchscreen/h3600_ts_input.c +2 -2
@@ -395,14 +395,14 @@ static int h3600ts_connect(struct serioset_GPIO_IRQ_edge (GPIO_BITSY_NPOWER_BUTTON ,GPIO_RISING_EDGE );if (request_irq (IRQ_GPIO_BITSY_ACTION_BUTTON , action_button_handler, -IRQF_SHARED |IRQF_DISABLED ,"h3600_action" , &ts->dev)) { +IRQF_SHARED ,"h3600_action" , &ts->dev)) {printk (KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n" ); err = -EBUSY ; goto fail2; }if (request_irq (IRQ_GPIO_BITSY_NPOWER_BUTTON , npower_button_handler, -IRQF_SHARED |IRQF_DISABLED ,"h3600_suspend" , &ts->dev)) { +IRQF_SHARED ,"h3600_suspend" , &ts->dev)) {printk (KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n" ); err = -EBUSY ; goto fail3;
drivers/input/touchscreen/hp680_ts_input.c +1 -1
@@ -93,7 +93,7 @@ static int __init hp680_ts_init(void) hp680_ts_dev->phys ="hp680_ts/input0" ;if (request_irq (HP680_TS_IRQ , hp680_ts_interrupt, -IRQF_DISABLED ,MODNAME ,0 ) <0 ) { +0 ,MODNAME ,0 ) <0 ) {printk (KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n" ,HP680_TS_IRQ ); err = -EBUSY ;
drivers/input/touchscreen/jornada720_ts.c +1 -1
@@ -126,7 +126,7 @@ static int __devinit jornada720_ts_probe error =request_irq (IRQ_GPIO9 , jornada720_ts_interrupt, -IRQF_DISABLED |IRQF_TRIGGER_RISING , +IRQF_TRIGGER_RISING ,"HP7XX Touchscreen driver" , pdev);if (error) {printk (KERN_INFO "HP7XX TS : Unable to acquire irq!\n" );
drivers/isdn/hardware/eicon/divasmain.c +1 -1
@@ -484,7 +484,7 @@ void __inline__ outpp(void __iomem *addrint diva_os_register_irq (void *context,byte irq,const char *name) {int result =request_irq (irq, diva_os_irq_wrapper, -IRQF_DISABLED |IRQF_SHARED , name, context); +IRQF_SHARED , name, context);return (result); }
drivers/isdn/sc/init.c +1 -1
@@ -334,7 +334,7 @@ static int __init sc_init(void)*/ sc_adapter[cinst]->interrupt = irq[b];if (request_irq (sc_adapter[cinst]->interrupt, interrupt_handler, -IRQF_DISABLED , interface->id, +0 , interface->id, (void *)(unsigned long ) cinst)) {kfree (sc_adapter[cinst]->channel);
drivers/media/common/saa7146_core.c +1 -1
@@ -416,7 +416,7 @@ static int saa7146_init_one(struct pci_dsaa7146_write (dev,MC2 ,0xf8000000 );/* request an interrupt for the saa7146 */ - err =request_irq (pci->irq, interrupt_hw,IRQF_SHARED |IRQF_DISABLED , + err =request_irq (pci->irq, interrupt_hw,IRQF_SHARED , dev->name, dev);if (err <0 ) {ERR (("request_irq() failed.\n" ));
drivers/media/dvb/bt8xx/bt878.c +1 -1
@@ -489,7 +489,7 @@ static int __devinit bt878_probe(structbtwrite (0 ,BT848_INT_MASK ); result =request_irq (bt->irq, bt878_irq, -IRQF_SHARED |IRQF_DISABLED ,"bt878" , +IRQF_SHARED ,"bt878" , (void *) bt);if (result == -EINVAL ) { printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
drivers/media/video/bt8xx/bttv-driver.c +1 -1
@@ -4379,7 +4379,7 @@ static int __devinit bttv_probe(struct p/* disable irqs, register irq handler */ btwrite (0 ,BT848_INT_MASK ); result =request_irq (btv->c.pci->irq, bttv_irq, -IRQF_SHARED |IRQF_DISABLED ,btv->c.name,(void *)btv); +IRQF_SHARED ,btv->c.name,(void *)btv);if (result <0 ) {printk (KERN_ERR "bttv%d: can't get IRQ %d\n" , bttv_num,btv->c.pci->irq);
drivers/media/video/cx18/cx18-driver.c +1 -1
@@ -882,7 +882,7 @@ static int __devinit cx18_probe(struct p/* Register IRQ */ retval =request_irq (cx->dev->irq, cx18_irq_handler, -IRQF_SHARED |IRQF_DISABLED , cx->name, (void *)cx); +IRQF_SHARED , cx->name, (void *)cx);if (retval) {CX18_ERR ("Failed to register irq %d\n" , retval); goto free_i2c;
drivers/media/video/cx23885/cx23885-core.c +1 -1
@@ -1751,7 +1751,7 @@ static int __devinit cx23885_initdev(str } err =request_irq (pci_dev->irq, cx23885_irq, -IRQF_SHARED |IRQF_DISABLED , dev->name, dev); +IRQF_SHARED , dev->name, dev);if (err <0 ) {printk (KERN_ERR "%s: can't get IRQ %d\n" , dev->name, pci_dev->irq);
drivers/media/video/cx88/cx88-alsa.c +1 -1
@@ -763,7 +763,7 @@ static int __devinit snd_cx88_create(str/* get irq */ err =request_irq (chip->pci->irq, cx8801_irq, -IRQF_SHARED |IRQF_DISABLED , chip->core->name, chip); +IRQF_SHARED , chip->core->name, chip);if (err <0 ) {dprintk (0 ,"%s: can't get IRQ %d\n" , chip->core->name, chip->pci->irq);
drivers/media/video/cx88/cx88-mpeg.c +1 -1
@@ -481,7 +481,7 @@ static int cx8802_init_common(struct cx8/* get irq */ err =request_irq (dev->pci->irq, cx8802_irq, -IRQF_SHARED |IRQF_DISABLED , dev->core->name, dev); +IRQF_SHARED , dev->core->name, dev);if (err <0 ) {printk (KERN_ERR "%s: can't get IRQ %d\n" , dev->core->name, dev->pci->irq);
drivers/media/video/cx88/cx88-video.c +1 -1
@@ -1881,7 +1881,7 @@ static int __devinit cx8800_initdev(stru/* get irq */ err =request_irq (pci_dev->irq, cx8800_irq, -IRQF_SHARED |IRQF_DISABLED , core->name, dev); +IRQF_SHARED , core->name, dev);if (err <0 ) {printk (KERN_ERR "%s/0: can't get IRQ %d\n" , core->name,pci_dev->irq);
drivers/media/video/ivtv/ivtv-driver.c +1 -1
@@ -1155,7 +1155,7 @@ static int __devinit ivtv_probe(struct p/* Register IRQ */ retval =request_irq (itv->dev->irq, ivtv_irq_handler, -IRQF_SHARED |IRQF_DISABLED , itv->device.name, (void *)itv); +IRQF_SHARED , itv->device.name, (void *)itv);if (retval) {IVTV_ERR ("Failed to register irq %d\n" , retval); goto free_i2c;
drivers/media/video/meye.c +1 -1
@@ -1833,7 +1833,7 @@ static int __devinit meye_probe(struct p meye.mchip_irq = pcidev->irq;if (request_irq (meye.mchip_irq, meye_irq, -IRQF_DISABLED |IRQF_SHARED ,"meye" , meye_irq)) { +IRQF_SHARED ,"meye" , meye_irq)) {printk (KERN_ERR "meye: request_irq failed\n" ); goto outreqirq; }
drivers/media/video/saa7134/saa7134-alsa.c +1 -1
@@ -1014,7 +1014,7 @@ static int alsa_card_saa7134_create(stru err =request_irq (dev->pci->irq, saa7134_alsa_irq, -IRQF_SHARED |IRQF_DISABLED , dev->name, +IRQF_SHARED , dev->name, (void *) &dev->dmasound);if (err <0 ) {
drivers/media/video/saa7134/saa7134-core.c +1 -1
@@ -961,7 +961,7 @@ static int __devinit saa7134_initdev(str/* get irq */ err =request_irq (pci_dev->irq, saa7134_irq, -IRQF_SHARED |IRQF_DISABLED , dev->name, dev); +IRQF_SHARED , dev->name, dev);if (err <0 ) {printk (KERN_ERR "%s: can't get IRQ %d\n" , dev->name,pci_dev->irq);
drivers/media/video/sh_mobile_ceu_camera.c +1 -1
@@ -820,7 +820,7 @@ static int sh_mobile_ceu_probe(struct pl }/* request irq */ - err =request_irq (pcdev->irq, sh_mobile_ceu_irq,IRQF_DISABLED , + err =request_irq (pcdev->irq, sh_mobile_ceu_irq,0 ,dev_name (&pdev->dev), pcdev);if (err) {dev_err (&pdev->dev,"Unable to register CEU interrupt.\n" );
drivers/media/video/stradis.c +1 -1
@@ -1985,7 +1985,7 @@ static int __devinit configure_saa7146(smemcpy (&saa->video_dev, &saa_template,sizeof (saa_template));saawrite (0 ,SAA7146_IER );/* turn off all interrupts */ - retval =request_irq (saa->irq, saa7146_irq,IRQF_SHARED |IRQF_DISABLED , + retval =request_irq (saa->irq, saa7146_irq,IRQF_SHARED ,"stradis" , saa);if (retval == -EINVAL )dev_err (&pdev->dev,"%d: Bad irq number or handler\n" , num);
drivers/media/video/zoran/zoran_card.c +1 -1
@@ -1368,7 +1368,7 @@ static int __devinit zoran_probe(struct } result =request_irq (zr->pci_dev->irq, zoran_irq, -IRQF_SHARED |IRQF_DISABLED ,ZR_DEVNAME (zr), zr); +IRQF_SHARED ,ZR_DEVNAME (zr), zr);if (result <0 ) {if (result == -EINVAL ) { dprintk(1,
drivers/mfd/da903x.c +1 -1
@@ -517,7 +517,7 @@ static int __devinit da903x_probe(struct chip->ops->read_events (chip, &tmp); ret =request_irq (client->irq, da903x_irq_handler, -IRQF_DISABLED |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_FALLING ,"da903x" , chip);if (ret) { dev_err(&client->dev, "failed to request irq %d\n",
drivers/mfd/menelaus.c +1 -1
@@ -1192,7 +1192,7 @@ static int menelaus_probe(struct i2c_climenelaus_write_reg (MENELAUS_MCT_CTRL1 ,0x73 );if (client->irq >0 ) { - err =request_irq (client->irq, menelaus_irq,IRQF_DISABLED , + err =request_irq (client->irq, menelaus_irq,0 ,DRIVER_NAME , menelaus);if (err) { dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
drivers/misc/phantom.c +1 -1
@@ -387,7 +387,7 @@ static int __devinit phantom_probe(struciowrite32 (0 , pht->caddr +PHN_IRQCTL );ioread32 (pht->caddr +PHN_IRQCTL );/* PCI posting */ retval =request_irq (pdev->irq, phantom_isr, -IRQF_SHARED |IRQF_DISABLED ,"phantom" , pht); +IRQF_SHARED ,"phantom" , pht);if (retval) {dev_err (&pdev->dev,"can't establish ISR\n" ); goto err_unmo;
drivers/mmc/host/omap_hsmmc.c +2 -2
@@ -1035,7 +1035,7 @@ static int __init omap_mmc_probe(struct OMAP_HSMMC_READ(host->base, HCTL) | SDBP);/* Request IRQ for MMC operations */ - ret =request_irq (host->irq, mmc_omap_irq,IRQF_DISABLED , + ret =request_irq (host->irq, mmc_omap_irq,0 ,mmc_hostname (mmc), host);if (ret) {dev_dbg (mmc_dev (host->mmc),"Unable to grab HSMMC IRQ\n" );
@@ -1055,7 +1055,7 @@ static int __init omap_mmc_probe(struct ret =request_irq (mmc_slot (host).card_detect_irq, omap_mmc_cd_handler,IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING - |IRQF_DISABLED , + ,mmc_hostname (mmc), host);if (ret) { dev_dbg(mmc_dev(host->mmc),
drivers/mmc/host/tmio_mmc.c +1 -1
@@ -614,7 +614,7 @@ static int __devinit tmio_mmc_probe(strudisable_mmc_irqs (host->ctl,TMIO_MASK_ALL ); - ret =request_irq (host->irq, tmio_mmc_irq,IRQF_DISABLED ,"tmio-mmc" , + ret =request_irq (host->irq, tmio_mmc_irq,0 ,"tmio-mmc" , host);if (ret) goto unmap_cnf;
drivers/mtd/nand/pxa3xx_nand.c +1 -1
@@ -1136,7 +1136,7 @@ static int pxa3xx_nand_probe(struct platif (ret) goto fail_free_io; - ret =request_irq (IRQ_NAND , pxa3xx_nand_irq,IRQF_DISABLED , + ret =request_irq (IRQ_NAND , pxa3xx_nand_irq,0 , pdev->name, info);if (ret <0 ) {dev_err (&pdev->dev,"failed to request IRQ\n" );
drivers/mtd/nand/tmio_nand.c +1 -1
@@ -433,7 +433,7 @@ static int tmio_probe(struct platform_de nand_chip->chip_delay =15 ; retval =request_irq (irq, &tmio_irq, -IRQF_DISABLED ,dev_name (&dev->dev), tmio); +0 ,dev_name (&dev->dev), tmio);if (retval) {dev_err (&dev->dev,"request_irq error %d\n" , retval); goto err_irq;
drivers/net/bfin_mac.c +1 -1
@@ -1102,7 +1102,7 @@ static int __devinit bfin_mac_probe(stru/* now, enable interrupts */ /* register irq handler */
Lines of this file are not shown. View the raw message.
drivers/staging/meilhaus/me0600_ext_irq.c +1 -5
Lines of this file are not shown. View the raw message.
drivers/staging/meilhaus/me1400_ext_irq.c +1 -5
Lines of this file are not shown. View the raw message.
drivers/staging/meilhaus/me4600_ext_irq.c +1 -5
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 9 lines · Peter Zijlstra
Hi Linus,
Would you be willing to take such a patch?
Its a rather big one, but if you think its a good idea, I can generate one against whatever tree is needed.
Provided I didn't break any !genirq stuff.. then again, that might be a nice incentive to fix up those last few archs.
look good IMO. If there are no objections, and given that it modifies half a thousand of files i'd suggest we do this near the end of the merge window and not carry it in the genirq tree
- while trivial it will still generate quite a bit of conflicts. Would that work with you?
Ingo
Quoted 5 lines · Ingo Molnar
Quoted 4 lines · Peter Zijlstra
Hi Linus,
Would you be willing to take such a patch?
Quoted 7 lines
Quoted 5 lines
Its a rather big one, but if you think its a good idea, I can generate one against whatever tree is needed.
Provided I didn't break any !genirq stuff.. then again, that might be a nice incentive to fix up those last few archs.
look good IMO. If there are no objections, and given that it
Perhaps someone could explain why we want to remove it? I just added it to AHCI for good reason, so I'd like to know why we think it should be taken away.
I added it because I was adding support for per-port interrupts. In the interrupt handler, we take the *host* lock (not the port lock). With multiple interrupt handlers per host, we would have to disable interrupts in the interrupt handler before taking the lock. Which is foolish because we've just re-enabled interrupts in the genirq code. Specifying IRQF_DISABLED means we just run with interrupts disabled.
You can argue that libata/ahci should be using a per-port lock, and I wouldn't disagree. But I'd still like to know why IRQF_DISABLED is being removed.
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Quoted 25 lines · Matthew Wilcox
Quoted 5 lines · Ingo Molnar
Quoted 4 lines · Peter Zijlstra
Hi Linus,
Would you be willing to take such a patch?
Quoted 7 lines
Quoted 5 lines
Its a rather big one, but if you think its a good idea, I can generate one against whatever tree is needed.
Provided I didn't break any !genirq stuff.. then again, that might be a nice incentive to fix up those last few archs.
look good IMO. If there are no objections, and given that it
Perhaps someone could explain why we want to remove it? I just added it to AHCI for good reason, so I'd like to know why we think it should be taken away.
I added it because I was adding support for per-port interrupts. In the interrupt handler, we take the *host* lock (not the port lock). With multiple interrupt handlers per host, we would have to disable interrupts in the interrupt handler before taking the lock. Which is foolish because we've just re-enabled interrupts in the genirq code. Specifying
IRQF_DISABLEDmeans we just run with interrupts disabled.
Quoted 3 lines
You can argue that libata/ahci should be using a per-port lock, and I wouldn't disagree. But I'd still like to know why
IRQF_DISABLEDis being removed.
The idea is to mandate IRQF_DISABLED for everybody, and since it doesn't do any good to have it a flag if you have it always enabled, remove it ;-)
Quoted 3 lines · Peter Zijlstra
The idea is to mandate
IRQF_DISABLEDfor everybody, and since it doesn't do any good to have it a flag if you have it always enabled, remove it ;-)
I don't have a problem with that.
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Quoted 3 lines · Peter Zijlstra
The idea is to mandate
IRQF_DISABLEDfor everybody, and since it doesn't do any good to have it a flag if you have it always enabled, remove it ;-)
Bad. Very bad.
So, when I use PIO IDE on embedded platforms, I have to have all other interrupts locked out for things like serial ports, network interfaces with small packet buffers, etc and I can't specify IRQF_DISABLE on such network interfaces anymore?
No, this is a step backwards. Please don't go there.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
Quoted 6 lines · Russell King
Quoted 3 lines · Peter Zijlstra
The idea is to mandate
IRQF_DISABLEDfor everybody, and since it doesn't do any good to have it a flag if you have it always enabled, remove it ;-)Bad. Very bad.
btw., your mailer is very broken and generates:
Mail-Followup-To: Peter Zijlstra <[email protected]>,
Matthew Wilcox <[email protected]>, Ingo Molnar <[email protected]>, Thomas Gleixner <[email protected]>,
Linus Torvalds <[email protected]>, lkml <[email protected]>,
linux-arch <[email protected]>,
Andrew Morton <[email protected]>
this messes up the To: line in a big way. Please stop it.
Ingo
Quoted 2 lines · Peter Zijlstra
Would you be willing to take such a patch?
Yes - some day.
The "irq's disabled fastpath" thing has been there since pretty much day one, because some irq handlers always wanted it. Making it the default (and the only choice) is fine.
HOWEVER.
The fact is, some interrupt handlers are too slow for this. If you are using a PIO IDE driver, not enabling interrupts will not only make you lose serial line interrupts like mad (even at slow speeds), but has historically resulted in even timer interrupts being lost because the IDE layer is so slow.
The thing is, with PIO, a 512-byte disk read ends up doing 256 16-bit word reads from the controller, each potentially up to 600ns long (PIO0 timings). That's 150ms - for a single sector!
Now, IDE controllers that we end up using PIO on all tend to be pretty old, but admittedly even the old ones are faster than the worst-case timings, so in practice you're not looking quite at that kind of horror case, but you're still looking at each sector transfer (256 16-bit words) taking on the order of tens of us.
For example, Mode2 timings are probably still something we should consider realistic, and that's 240ns per word - a single sector now takes ~60ms to read off the disk.
And we don't do single sectors. Most transfers will be 8 sectors (4k contiguos read). So now that 60ms is 480ms per such IDE interrupt. And even with the _good_ timings, we're certainly looking at a reduction of that to about half.
Imagine what happens when we have interrupts disabled for half a second at a time.
In other words, I do not think we are ready for this.
Now: I suspect you don't have a single machine that does PIO by default, and you probably haven't had any for the last ten years. These things _are_ old. But they do exist.
Could we make IRQF_DISABLED the default? Hell yes. We probably should. But we realistically can't remove the non-disabled case, until you also have a (tested) patch to fix these kinds of issues for the IDE PIO case (and possibly others - IDE is the one I _know_ needs it).
Could we make just the IDE driver itself enable interrupts? Sure. But that means that the interrupt controller code needs to know that some drivers may enable interrupts and they may have recursive interrupts occurring. In which case you really do want a flag anyway, since the interrupt controller may well end up deciding that the "we're not going to enable interrupts" case allows certain optimizations (like just ACK'ing it immediately and not masking it at the interrupt controller).
So this is not as simple as your patch. Not even _nearly_.
Linus
Quoted 47 lines · Linus Torvalds
Quoted 2 lines · Peter Zijlstra
Would you be willing to take such a patch?
Yes - some day.
The "irq's disabled fastpath" thing has been there since pretty much day one, because some irq handlers always wanted it. Making it the default (and the only choice) is fine.
HOWEVER.
The fact is, some interrupt handlers are too slow for this. If you are using a PIO IDE driver, not enabling interrupts will not only make you lose serial line interrupts like mad (even at slow speeds), but has historically resulted in even timer interrupts being lost because the IDE layer is so slow.
The thing is, with PIO, a 512-byte disk read ends up doing 256 16-bit word reads from the controller, each potentially up to 600ns long (PIO0 timings). That's 150ms - for a single sector!
Now, IDE controllers that we end up using PIO on all tend to be pretty old, but admittedly even the old ones are faster than the worst-case timings, so in practice you're not looking quite at that kind of horror case, but you're still looking at each sector transfer (256 16-bit words) taking on the order of tens of us.
For example, Mode2 timings are probably still something we should consider realistic, and that's 240ns per word - a single sector now takes ~60ms to read off the disk.
And we don't do single sectors. Most transfers will be 8 sectors (4k contiguos read). So now that 60ms is 480ms per such IDE interrupt. And even with the _good_ timings, we're certainly looking at a reduction of that to about half.
Imagine what happens when we have interrupts disabled for half a second at a time.
In other words, I do not think we are ready for this.
Now: I suspect you don't have a single machine that does PIO by default, and you probably haven't had any for the last ten years. These things _are_ old. But they do exist.
Quoted 6 lines
Could we make
IRQF_DISABLEDthe default? Hell yes. We probably should. But we realistically can't remove the non-disabled case, until you also have a (tested) patch to fix these kinds of issues for the IDE PIO case (and possibly others - IDE is the one I _know_ needs it).Could we make just the IDE driver itself enable interrupts? Sure. But that
Actually it has been doing it for years (some host drivers don't do this by default and still need "hdparm -u" or equivalent but I was planning to change it for 2.6.30).
Quoted 7 lines
means that the interrupt controller code needs to know that some drivers may enable interrupts and they may have recursive interrupts occurring. In which case you really do want a flag anyway, since the interrupt controller may well end up deciding that the "we're not going to enable interrupts" case allows certain optimizations (like just ACK'ing it immediately and not masking it at the interrupt controller). So this is not as simple as your patch. Not even _nearly_.
IDE IRQ handler (& probably many others) assume that IRQ layer won't be trying to call it again while IRQ is being serviced -- is this going to change with the introduction of threaded IRQs?
Thanks,
Bart
Quoted 3 lines · Bartlomiej Zolnierkiewicz
IDE IRQ handler (& probably many others) assume that IRQ layer won't be trying to call it again while IRQ is being serviced -- is this going to change with the introduction of threaded IRQs?
No, the real hardirq handler needs to disable the irq line before telling it wants the thread to run. The thread will then have to re-enable the irq line after its done.
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Quoted 1 line
Could we make just the IDE driver itself enable interrupts? Sure. But that
Actually it has been doing it for years (some host drivers don't do this by default and still need "hdparm -u" or equivalent but I was planning to change it for 2.6.30).
What does it use to do that? A local_irq_enable() in hardirq context will make lockdep yell bloody murder :-).
Then there is local_irq_enable_in_hardirq(), which plain simply lies when lockdep is enabled -- IOW it would generate horrid irq latencies.
Not having to deal with IRQ recursion in lockdep helps.
Quoted 7 lines · Peter Zijlstra
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Quoted 1 line
Could we make just the IDE driver itself enable interrupts? Sure. But that
Actually it has been doing it for years (some host drivers don't do this by default and still need "hdparm -u" or equivalent but I was planning to change it for 2.6.30).
Quoted 7 lines
What does it use to do that? A
local_irq_enable()in hardirq context will make lockdep yell bloody murder :-).Then there is
local_irq_enable_in_hardirq(), which plain simply lies when lockdep is enabled -- IOW it would generate horrid irq latencies.Not having to deal with IRQ recursion in lockdep helps.
Lockdep problems are the least of our worries here (please read Linus' original mail for details). If you're asking why it is not handled in softirq -- that's solely because of the historical reasons and I have high hopes w.r.t. threaded IRQs work here [that it will allow us to address this issue without too much pain].
Thanks,
Bart
Quoted 6 lines · Bartlomiej Zolnierkiewicz
Quoted 2 lines
Could we make just the IDE driver itself enable interrupts? Sure. But that
Actually it has been doing it for years (some host drivers don't do this by default and still need "hdparm -u" or equivalent but I was planning to change it for 2.6.30).
The IDE layer has the option to enable irq's during the transfer itself, yes. But it actually works the reverse way from what you think: the irq layer will enable interrupts, and the IDE layer will then _not_ disable them during the transfer if you use "hdparm -u".
Look at ide_intr: it generally gets called with interrupts _enabled_ (because it doesn't use IRQF_DISABLED) and then it does:
spin_lock_irqsave(&hwif->lock, flags);
..
spin_unlock(&hwif->lock);
..
if (drive->dev_flags & IDE_DFLAG_UNMASK)
local_irq_enable_in_hardirq();
...
spin_lock_irq(&hwif->lock);
...
spin_unlock_irqrestore(&hwif->lock, flags);where the magic thing is how it enables irqs again if the "irq unmask" flag is set.
The point I'm making is that
- as far as the generic irq layer is concerned, IDE might as well have interrupts enabled all the time (and disabling them is a local issue, more to do with locking and with timing-induced hardware _bugs_ rather than anything else)
- .. and more importantly, that is AS IT MUST BE. Because quite frankly, if the irq handler enables interrupts (like IDE does), the generic IRQ layer really _must_ know about it, because it may depend on non-reentrancy of that interrupt.
(Small detail: the current irq layer actually does have that "IRQ_INPROGRESS" flag to handle re-entrancy issues regardless of anything else, so I guess we technically are robust in this regard. But that's partly an SMP issue, and conceptually it's still really really important information to know whether interrupts can nest. In practice, it does affect things like stack usage too, for example, so even with IRQ_INPROGRESS, there really is a difference between IRQF_DISABLED and not having it on).
Linus
Quoted 11 lines · Linus Torvalds
Quoted 6 lines · Bartlomiej Zolnierkiewicz
Quoted 2 lines
Could we make just the IDE driver itself enable interrupts? Sure. But that
Actually it has been doing it for years (some host drivers don't do this by default and still need "hdparm -u" or equivalent but I was planning to change it for 2.6.30).
The IDE layer has the option to enable irq's during the transfer itself, yes. But it actually works the reverse way from what you think: the irq
Hmm, I said nothing about how it is implemented in the IDE code itself. :)
Quoted 27 lines
layer will enable interrupts, and the IDE layer will then _not_ disable them during the transfer if you use "hdparm -u".
Look at
ide_intr: it generally gets called with interrupts _enabled_ (because it doesn't useIRQF_DISABLED) and then it does:spin_lock_irqsave(&hwif->lock, flags); .. spin_unlock(&hwif->lock); .. if (drive->dev_flags & IDE_DFLAG_UNMASK) local_irq_enable_in_hardirq(); ... spin_lock_irq(&hwif->lock); ... spin_unlock_irqrestore(&hwif->lock, flags);where the magic thing is how it enables irqs again if the "irq unmask" flag is set.
The point I'm making is that
- as far as the generic irq layer is concerned, IDE might as well have interrupts enabled all the time (and disabling them is a local issue, more to do with locking and with timing-induced hardware _bugs_ rather than anything else)
Quoted 4 lines
- .. and more importantly, that is AS IT MUST BE. Because quite frankly, if the irq handler enables interrupts (like IDE does), the generic IRQ layer really _must_ know about it, because it may depend on non-reentrancy of that interrupt.
Fixing this is on long-term TODO (there was just a ton of more high-prio stuff to take care of first).
Thanks,
Bart
Quoted 2 lines · Bartlomiej Zolnierkiewicz
Hmm, I said nothing about how it is implemented in the IDE code itself. :)
Bart, you're missing the point. I'm _also_ not at all interested in how it's implemented in the IDE code.
The whole - and only - point is that there are drivers that are _known_ to require non-IRQF_DISABLED semantics. IDE is one such one.
Quoted 2 lines
Fixing this is on long-term TODO (there was just a ton of more high-prio stuff to take care of first).
Even if you can fix IDE to do everything using softirq's or other tricks (threads, whatever), nothing really changes. It just means that now there is one less driver that may need the non-IRQF_DISABLED semantics.
So I'm perfectly happy with
- making IRQF_DISABLED the _default_ (and make the value of the flag be 0, for example, so that people can still _use_ it)
- but when we find a driver that depended on irq's being on, have a new flag like IRQF_REENABLE, which has the semantics of the current default of !IRQF_DISABLED
but I don't think it's reasonable to just drop the support. IDE requires it, and it's been a known requirement for basically forever. Other drivers with similar issues? Who the heck knows?
I do know that the _generic_ SCSI layer used to have some insane reset timeouts inside the interrupt handler, and literally *depended* on timer interrupts happening while inside the SCSI interrupt. I'm hoping that's no longer the case. But this is the kind of thing that has been going on.
Linus
Quoted 11 lines · Linus Torvalds
Quoted 2 lines · Bartlomiej Zolnierkiewicz
Hmm, I said nothing about how it is implemented in the IDE code itself. :)
Bart, you're missing the point. I'm _also_ not at all interested in how it's implemented in the IDE code.
The whole - and only - point is that there are drivers that are _known_ to require non-IRQF_DISABLED semantics. IDE is one such one.
Quoted 6 lines
Quoted 2 lines
Fixing this is on long-term TODO (there was just a ton of more high-prio stuff to take care of first).
Even if you can fix IDE to do everything using softirq's or other tricks (threads, whatever), nothing really changes. It just means that now there is one less driver that may need the non-IRQF_DISABLED semantics.
I didn't meant non-IRQF_DISABLED semantics (I see absolutely no point in changing it) but IDE's internal "disable IRQs just to enable them" issue.
[ Sorry for poorly explaining things. ]
Thanks,
Bart
On Mon, 2009-03-02 at 09:11 -0800, Linus Torvalds wrote:
<story about how PIO IDE sucks>
Quoted 1 line
So this is not as simple as your patch. Not even _nearly_.
Yuckness, yes that does complicate matters significantly.
That leaves us trying to find all request_irq() invocations that do not have IRQF_DISABLED.. /me puts it on the todo list.
Quoted 3 lines · On Monday 02 March 2009 09:11:54 Linus Torvalds wrote:
The thing is, with PIO, a 512-byte disk read ends up doing 256 16-bit word reads from the controller, each potentially up to 600ns long (PIO0 timings). That's 150ms - for a single sector!
Out of curiosity, the peanut gallery wishes to ask:
Is the above supposed to be 600us (*1000), or 150us (/1000)? Probably the latter.
Quoted 3 lines
For example, Mode2 timings are probably still something we should consider realistic, and that's 240ns per word - a single sector now takes ~60ms to read off the disk.
Same factor of 1000 question here.
Quoted 7 lines
And we don't do single sectors. Most transfers will be 8 sectors (4k contiguos read). So now that 60ms is 480ms per such IDE interrupt. And even with the _good_ timings, we're certainly looking at a reduction of that to about half.
Imagine what happens when we have interrupts disabled for half a second at a time.
-- Vadim Lobanov
Quoted 8 lines · Vadim Lobanov
Quoted 3 lines · On Monday 02 March 2009 09:11:54 Linus Torvalds wrote:
The thing is, with PIO, a 512-byte disk read ends up doing 256 16-bit word reads from the controller, each potentially up to 600ns long (PIO0 timings). That's 150ms - for a single sector!
Out of curiosity, the peanut gallery wishes to ask:
Is the above supposed to be 600us (*1000), or 150us (/1000)? Probably the latter.
Sorry, I was off by a lot. Yes. /1000. The end result ends up being lots better (and I should have realized I did my conversion wrong, because the times ended up being _so_ big), but not better enough - we've had dropped timer interrupts etc on those kinds of machines unless you use "hdparm -u1".
Although it porbably does mean that the problem tends to be more in the really bad mode0 case (600ns -> 150us/sector -> milliseconds for multi-sector transfers).
I forget what our multi-sector limit is, I think it tends to be 16. So you'll never get _really_ long irq-off times, but "several ms" is still pretty damn bad.
Linus
Quoted 2 lines · Linus Torvalds
Although it porbably does mean that the problem tends to be more in the really bad mode0 case (600ns -> 150us/sector -> milliseconds for multi-sector transfers).
..
Heh.. it's worse that that: even with commonplace mode4 (120ns) transfers, each PCI bus transaction from start to finish often takes about 1us, so for a 16-sector multi-sector read, that means 4ms+ with interrupts off.
Quoted 1 line
I forget what our multi-sector limit is, I think it tends to be 16. So you'll never get _really_ long irq-off times, but "several ms" is still pretty damn bad.
..
It's a device limit, usually 8 or 16 sectors for nearly all drives now.
Cheers
Quoted 5 lines
Now, IDE controllers that we end up using PIO on all tend to be pretty old, but admittedly even the old ones are faster than the worst-case timings, so in practice you're not looking quite at that kind of horror case, but you're still looking at each sector transfer (256 16-bit words) taking on the order of tens of us.
The worst case timings are far worse because of IORDY.
Quoted 3 lines
Now: I suspect you don't have a single machine that does PIO by default, and you probably haven't had any for the last ten years. These things _are_ old. But they do exist.
I bet you do for some stuff. Most CF cards are PIO only. Several controllers need to do PIO for some corner cases. Almost all pre-AHCI controllers issue command blocks via PIO.
Worse still of course some controllers have an erratum where touching some of the other registers during a transfer [which is what you need to do to see if you are the IRQ source] corrupts the transfer. Not all devices honour the IRQ masking bit on the device either. That makes the generalised case of doing both unmasked transfers after an IRQ and the errata cases of handling IRQs you can't mask and must leave disabled rather more exciting than is nice.
Alan
Quoted 10 lines · Linus Torvalds
Quoted 2 lines · Peter Zijlstra
Would you be willing to take such a patch?
Yes - some day.
The "irq's disabled fastpath" thing has been there since pretty much day one, because some irq handlers always wanted it. Making it the default (and the only choice) is fine.
.../...
I tend to disagree... (not -that- strongly but I felt like saying it anyway :-) some archs have a reasonably nice support in the PIC for interrupt priorities, allowing higher priority interrupts to "preempt" lower priority ones, which this would effectively render useless.
Also, while yes, I agree, interrupts handlers -should- be short in practice IDE is far from being the only example where this is not the case and so we would delay timer interrupts for example for a significant amount of time (or serial, that's another good example).
Also, we use the priority on some platform to have a high priority used as a kind of "debugger" NMI .. ie, we don't have a real NMI but it's better than nothing and here too, this would break it.
I don't see us having such a strong benefit from this... in fact, with things like -rt, interrupts get moved to threads no ? Thus they typically run with interrupts enabled... why have a different behaviour on non-rt ? or I am missing something ? (I'm not terribly familiar with the -rt stuff here so I probably am missing something).
Cheers,
Ben.
Quoted 19 lines · Benjamin Herrenschmidt
Quoted 10 lines · Linus Torvalds
Quoted 2 lines · Peter Zijlstra
Would you be willing to take such a patch?
Yes - some day.
The "irq's disabled fastpath" thing has been there since pretty much day one, because some irq handlers always wanted it. Making it the default (and the only choice) is fine.
.../...
I tend to disagree... (not -that- strongly but I felt like saying it anyway :-) some archs have a reasonably nice support in the PIC for interrupt priorities, allowing higher priority interrupts to "preempt" lower priority ones, which this would effectively render useless.
Quoted 8 lines
Also, while yes, I agree, interrupts handlers -should- be short in practice IDE is far from being the only example where this is not the case and so we would delay timer interrupts for example for a significant amount of time (or serial, that's another good example).
Also, we use the priority on some platform to have a high priority used as a kind of "debugger" NMI .. ie, we don't have a real NMI but it's better than nothing and here too, this would break it.
If you have distinct interrupt priorities, you can
1) provide an interrupt stack for each priority
2) mask all lower priorities when handling one
Would that not work?
Quoted 5 lines
I don't see us having such a strong benefit from this... in fact, with things like -rt, interrupts get moved to threads no ? Thus they typically run with interrupts enabled... why have a different behaviour on non-rt ? or I am missing something ? (I'm not terribly familiar with the -rt stuff here so I probably am missing something).
Threaded interrupts are quite a different beast. To make best use of them device drivers will have to be re-written. Hence the opt-in approach.
The problems with enabling irqs in hardirq handlers are that you get unlimited irq nesting, which is bad for your stack, furthermore, somehow people thing it makes things 'faster' because the irq-off latency goes down.
The latter just isn't true, as you still have preemption disabled, so everything but irqs still suffers.
The only way to make things low-latency is to pull work out of non-preemptable context. Using threaded IRQs is one way to do that.
Quoted 7 lines
If you have distinct interrupt priorities, you can
1) provide an interrupt stack for each priority
2) mask all lower priorities when handling oneWould that not work?
The PIC does that already. IE. it will only interrupt again before ->eoi() for an interrupt of a higher priority. But by using IRQF_DISABLED, you mask interrupts in the core, and thus effectively completely prevents the whole thing.
Quoted 4 lines
The problems with enabling irqs in hardirq handlers are that you get unlimited irq nesting, which is bad for your stack, furthermore, somehow people thing it makes things 'faster' because the irq-off latency goes down.
No, you don't get unlimited IRQ nesting, at least not on sane archs with a decent PIC that does things like what I described above :-)
Quoted 5 lines
The latter just isn't true, as you still have preemption disabled, so everything but irqs still suffers.
The only way to make things low-latency is to pull work out of non-preemptable context. Using threaded IRQs is one way to do that.
Cheers,
Ben.
Quoted 3 lines
No, you don't get unlimited IRQ nesting, at least not on sane archs with a decent PIC that does things like what I described above :-)
Note that if unlimited nesting is what you are afraid of, you can do something along the lines of:
- if (!(action->flags & IRQF_DISABLED))
+ if (arch_nest_irq() && !(action->flags & IRQF_DISABLED))
local_irq_enable_in_hardirq();
With arch_nest_irq() then set to always return 0 if you want, or be smarter and check how much stack space is left, and return 1 only if above a reasonable threshold.
Cheers,
Ben.
Quoted 12 lines · Benjamin Herrenschmidt
Quoted 6 lines
If you have distinct interrupt priorities, you can
1) provide an interrupt stack for each priority
2) mask all lower priorities when handling oneWould that not work?
The PIC does that already. IE. it will only interrupt again before ->eoi() for an interrupt of a higher priority. But by using
IRQF_DISABLED, you mask interrupts in the core, and thus effectively completely prevents the whole thing.
Quoted 7 lines
Quoted 4 lines
The problems with enabling irqs in hardirq handlers are that you get unlimited irq nesting, which is bad for your stack, furthermore, somehow people thing it makes things 'faster' because the irq-off latency goes down.
No, you don't get unlimited IRQ nesting, at least not on sane archs with a decent PIC that does things like what I described above :-)
Right, welcome to x86 ;-)
Sounds to me we need to extend genirq a bit... Thomas?
Quoted 18 lines · Peter Zijlstra
Quoted 17 lines · Benjamin Herrenschmidt
Quoted 6 lines
If you have distinct interrupt priorities, you can
1) provide an interrupt stack for each priority
2) mask all lower priorities when handling oneWould that not work?
The PIC does that already. IE. it will only interrupt again before ->eoi() for an interrupt of a higher priority. But by using
IRQF_DISABLED, you mask interrupts in the core, and thus effectively completely prevents the whole thing.Quoted 4 lines
The problems with enabling irqs in hardirq handlers are that you get unlimited irq nesting, which is bad for your stack, furthermore, somehow people thing it makes things 'faster' because the irq-off latency goes down.
Quoted 4 lines
Quoted 2 lines
No, you don't get unlimited IRQ nesting, at least not on sane archs with a decent PIC that does things like what I described above :-)
Right, welcome to x86 ;-)
Ok, people put me straight here. Since linux not support interrupt priorities, wouldn't it simply be a matter of implementing local_irq_en/dis-able() as masking the lowest level you use to run normal interrupts on?
That will leave your other interrupt level available as NMI/debug thingies.
Quoted 8 lines
Ok, people put me straight here. Since linux not support interrupt priorities, wouldn't it simply be a matter of implementing local_irq_en/dis-able() as masking the lowest level you use to run normal interrupts on?
That will leave your other interrupt level available as NMI/debug thingies.
No, you are missing some subtle things here.
local_irq_enable/disable() is about masking interrupts at the core level. This will, on archs like powerpc, mask them -all- including the timer for example, which is not sourced externally for us but comes from a specific CPU facility and generates a different exception vector from external interrupts. It also include to some extent perfmon interrupts etc...
Now, once you get to -external- interrupts, there is one input line per core/thread (some archs have more, and some powerpc variants also have a second one for "critical" interrupts but let's not go there for now). This line is controlled by a PIC, which can be one of many sorts, such as the OpenMPIC (aka MPIC, popular on macs among other things), XICS (newer pseries), etc...
Those PICs have a concept of priority (they don't all do, but on powerpc it happens that a good chunk of them do). IE. individual external interrupts can be prioritized. Also, because some of these are "smart" PICs, (they use a fasteoi flow handler), they know whether an interrupt is still being serviced and can handle priorities at eoi time. They typically maintain a per-cpu current priority register internally, raised when a CPU gets/acks an interrupt and lowered when that CPU does an EOI).
So basically, you not only have the ability to control what interrupts can nest what interrupts, but you -know- that at equal priorities, no nesting will occur, which allows to fairly easily limit the amount of nesting overall.
Hence, there is effectively no risk of uncontrolled nesting (unless it's configured like shit which is always a possibility);
Now, as I proposed in an earlier email (maybe it got lost), if uncontrolled nesting is what motivates you here, why not just change the test of IRQF_DISABLED to also test for an arch hook, let's call it arch_nest_irq(). Archs can hard wire that to 0 effectively enforcing IRQF_DISABLED semantics on all interrupts. But you can be smarter and look at how much stack space remains on your interrupt stack, and only allow nesting if it's for example more than a couple of KBs.
Cheers,
Ben.
Quoted 6 lines · On Mon, 02 Mar 2009 13:21:17 +0100 Peter Zijlstra <[email protected]> wrote:
People are playing odd games with
IRQF_DISABLED, remove it.Its not reliable, since shared interrupt lines could disable it for you, and its possible and allowed for archs to disable IRQs to limit IRQ nesting.
Quoted 7 lines
Therefore, simply mandate that _ALL_ IRQ handlers are run with IRQs disabled.
[ This _should_ not break anything, since we've mandated that IRQ handlers
_must_ be able to deal with this for a _long_ time ]IRQ handlers should be fast, no if buts and any other exceptions. We also have plenty instrumentation to find any offending IRQ latency sources.
Changelog is a bit cruddy. What are these "odd games" and why are they so serious as to warrant a fairly drastic-looking patch?
Where are these odd games being played, and what are the implications to those codesites of having their ball taken away? etc.
wrt the patch itself - it would make life easier if we were to leave the IRQF_DISABLED definition in place for a while. I'm counting 47 new additions of references to IRQF_DISABLED in linux-next/-mm. It would grease the wheels a bit were these things (and out-of-tree drivers) to not instabreak. One could add a nice runtime warning at request_irq() time, leave that in place until everything is fixed up.
Quoted 10 lines · Andrew Morton
Quoted 8 lines · On Mon, 02 Mar 2009 13:21:17 +0100 Peter Zijlstra <[email protected]> wrote:
People are playing odd games with
IRQF_DISABLED, remove it.Its not reliable, since shared interrupt lines could disable it for you, and its possible and allowed for archs to disable IRQs to limit IRQ nesting.
Therefore, simply mandate that _ALL_ IRQ handlers are run with IRQs disabled.
Quoted 8 lines
Quoted 5 lines
[ This _should_ not break anything, since we've mandated that IRQ handlers
_must_ be able to deal with this for a _long_ time ]IRQ handlers should be fast, no if buts and any other exceptions. We also have plenty instrumentation to find any offending IRQ latency sources.
Changelog is a bit cruddy. What are these "odd games" and why are they so serious as to warrant a fairly drastic-looking patch?
See for example the stuff David Brownell was trying to pull off.
I was -- naively it turns out -- hoping it would be a simple matter of cleaning up, as lockdep has been doing this for a long while now.
Quoted 2 lines
Where are these odd games being played, and what are the implications to those codesites of having their ball taken away? etc.
Generation of terrible IRQ latency, or in David's case, more pain for the abuse of the genirq layer.
Quoted 6 lines
wrt the patch itself - it would make life easier if we were to leave the
IRQF_DISABLEDdefinition in place for a while. I'm counting 47 new additions of references toIRQF_DISABLEDin linux-next/-mm. It would grease the wheels a bit were these things (and out-of-tree drivers) to not instabreak. One could add a nice runtime warning atrequest_irq()time, leave that in place until everything is fixed up.
Sure, can do.