Skip to contentSkip to conversation

tip related: radix tree for spareseirq and logical flat clean up

PATCH In review Yinghai Lu 6 participants 43 messages Feb 13, 2010 – Mar 3, 2010 2 messages not in the archive Page 2 of 2

Subsystems (51)
lore
Share & tools
lore
author
#38 lore raw

RFC PATCH 3/3 genericirq: change ack/mask in irq_chip to take irq_desc in addition to irq

In reply to a message not in the archive

will have

void            (*ack)(unsigned int irq, struct irq_desc *desc);
void            (*mask)(unsigned int irq, struct irq_desc *desc);
void            (*mask_ack)(unsigned int irq, struct irq_desc *desc);
void            (*unmask)(unsigned int irq, struct irq_desc *desc);
void            (*eoi)(unsigned int irq, struct irq_desc *desc);

so for sparseirq with raidix tree, we don't call extra irq_to_desc, and could use desc directly

---

---
 Documentation/DocBook/genericirq.tmpl            |   12 +++---
 arch/alpha/kernel/irq_alpha.c                    |    3 +
 arch/alpha/kernel/irq_i8259.c                    |    7 +++
 arch/alpha/kernel/irq_pyxis.c                    |    2 -
 arch/alpha/kernel/irq_srm.c                      |    8 +++-
 arch/alpha/kernel/sys_alcor.c                    |    2 -
 arch/alpha/kernel/sys_cabriolet.c                |    8 +++-
 arch/alpha/kernel/sys_dp264.c                    |   16 +++++++-
 arch/alpha/kernel/sys_eb64p.c                    |    8 +++-
 arch/alpha/kernel/sys_eiger.c                    |    8 +++-
 arch/alpha/kernel/sys_jensen.c                   |    2 -
 arch/alpha/kernel/sys_marvel.c                   |   18 +++++++---
 arch/alpha/kernel/sys_mikasa.c                   |    8 +++-
 arch/alpha/kernel/sys_noritake.c                 |    8 +++-
 arch/alpha/kernel/sys_rawhide.c                  |    2 -
 arch/alpha/kernel/sys_rx164.c                    |    8 +++-
 arch/alpha/kernel/sys_sable.c                    |    2 -
 arch/alpha/kernel/sys_takara.c                   |    8 +++-
 arch/alpha/kernel/sys_titan.c                    |    8 +++-
 arch/alpha/kernel/sys_wildfire.c                 |    2 -
 arch/arm/common/gic.c                            |   10 ++---
 arch/arm/common/it8152.c                         |    4 +-
 arch/arm/common/locomo.c                         |   32 ++++++++---------
 arch/arm/common/sa1111.c                         |   14 +++----
 arch/arm/common/vic.c                            |    6 +--
 arch/arm/kernel/ecard.c                          |   10 ++---
 arch/arm/mach-aaec2000/core.c                    |    6 +--
 arch/arm/mach-at91/gpio.c                        |    8 ++--
 arch/arm/mach-at91/irq.c                         |    4 +-
 arch/arm/mach-bcmring/irq.c                      |   12 +++---
 arch/arm/mach-clps711x/irq.c                     |   12 +++---
 arch/arm/mach-davinci/cp_intc.c                  |    6 +--
 arch/arm/mach-davinci/gpio.c                     |    6 +--
 arch/arm/mach-davinci/irq.c                      |    6 +--
 arch/arm/mach-dove/irq.c                         |    6 +--
 arch/arm/mach-ebsa110/core.c                     |    4 +-
 arch/arm/mach-ep93xx/core.c                      |    8 ++--
 arch/arm/mach-footbridge/common.c                |    4 +-
 arch/arm/mach-footbridge/isa-irq.c               |   12 +++---
 arch/arm/mach-gemini/gpio.c                      |    6 +--
 arch/arm/mach-gemini/irq.c                       |    6 +--
 arch/arm/mach-h720x/common.c                     |   10 ++---
 arch/arm/mach-h720x/cpu-h7202.c                  |    4 +-
 arch/arm/mach-integrator/integrator_ap.c         |    4 +-
 arch/arm/mach-integrator/integrator_cp.c         |   12 +++---
 arch/arm/mach-iop13xx/irq.c                      |   16 ++++----
 arch/arm/mach-iop13xx/msi.c                      |    2 -
 arch/arm/mach-iop32x/irq.c                       |    4 +-
 arch/arm/mach-ixp2000/core.c                     |   18 +++++-----
 arch/arm/mach-ixp2000/ixdp2x00.c                 |    8 ++--
 arch/arm/mach-ixp2000/ixdp2x01.c                 |    8 ++--
 arch/arm/mach-ixp23xx/core.c                     |   16 ++++----
 arch/arm/mach-ixp23xx/ixdp2351.c                 |   16 ++++----
 arch/arm/mach-ixp4xx/common.c                    |    6 +--
 arch/arm/mach-ks8695/irq.c                       |    6 +--
 arch/arm/mach-l7200/core.c                       |    4 +-
 arch/arm/mach-lh7a40x/arch-kev7a400.c            |    6 +--
 arch/arm/mach-lh7a40x/arch-lpd7a40x.c            |   10 ++---
 arch/arm/mach-lh7a40x/irq-lh7a400.c              |    6 +--
 arch/arm/mach-lh7a40x/irq-lh7a404.c              |   12 +++---
 arch/arm/mach-lh7a40x/irq-lpd7a40x.c             |   10 ++---
 arch/arm/mach-mmp/irq.c                          |    4 +-
 arch/arm/mach-mx3/mx31ads.c                      |    6 +--
 arch/arm/mach-mx3/mx31pdk.c                      |    6 +--
 arch/arm/mach-netx/generic.c                     |    6 +--
 arch/arm/mach-nomadik/gpio.c                     |    6 +--
 arch/arm/mach-ns9xxx/board-a9m9750dev.c          |   12 +++---
 arch/arm/mach-ns9xxx/irq.c                       |   12 +++---
 arch/arm/mach-omap1/fpga.c                       |    8 ++--
 arch/arm/mach-omap1/irq.c                        |   12 +++---
 arch/arm/mach-pnx4008/irq.c                      |    6 +--
 arch/arm/mach-pxa/balloon3.c                     |    6 +--
 arch/arm/mach-pxa/irq.c                          |   10 ++---
 arch/arm/mach-pxa/lpd270.c                       |    4 +-
 arch/arm/mach-pxa/lubbock.c                      |    4 +-
 arch/arm/mach-pxa/mainstone.c                    |    4 +-
 arch/arm/mach-pxa/pcm990-baseboard.c             |    4 +-
 arch/arm/mach-pxa/pxa3xx.c                       |    6 +--
 arch/arm/mach-pxa/viper.c                        |    6 +--
 arch/arm/mach-pxa/zeus.c                         |    8 ++--
 arch/arm/mach-rpc/irq.c                          |   18 +++++-----
 arch/arm/mach-s3c2410/bast-irq.c                 |   12 ++----
 arch/arm/mach-s3c2412/irq.c                      |   14 +++----
 arch/arm/mach-s3c2440/irq.c                      |    6 +--
 arch/arm/mach-s3c2443/irq.c                      |   30 ++++++++--------
 arch/arm/mach-sa1100/irq.c                       |   16 ++++----
 arch/arm/mach-sa1100/neponset.c                  |    8 ++--
 arch/arm/mach-shark/irq.c                        |    8 ++--
 arch/arm/mach-stmp378x/stmp378x.c                |    6 +--
 arch/arm/mach-stmp37xx/stmp37xx.c                |    6 +--
 arch/arm/mach-versatile/core.c                   |    4 +-
 arch/arm/mach-w90x900/irq.c                      |    6 +--
 arch/arm/plat-mxc/gpio.c                         |    6 +--
 arch/arm/plat-mxc/irq.c                          |    4 +-
 arch/arm/plat-omap/gpio.c                        |   18 +++++-----
 arch/arm/plat-orion/gpio.c                       |    6 +--
 arch/arm/plat-orion/irq.c                        |    4 +-
 arch/arm/plat-pxa/gpio.c                         |    6 +--
 arch/arm/plat-s3c24xx/irq.c                      |   38 ++++++++++-----------
 arch/arm/plat-s3c24xx/s3c244x-irq.c              |    6 +--
 arch/arm/plat-s3c64xx/irq-eint.c                 |   12 +++---
 arch/arm/plat-s3c64xx/irq.c                      |   14 +++----
 arch/arm/plat-s5pc1xx/irq-eint.c                 |   24 ++++++-------
 arch/arm/plat-s5pc1xx/irq-gpio.c                 |   12 +++---
 arch/arm/plat-s5pc1xx/irq.c                      |   14 +++----
 arch/arm/plat-stmp3xxx/irq.c                     |    2 -
 arch/arm/plat-stmp3xxx/pinmux.c                  |    6 +--
 arch/avr32/mach-at32ap/extint.c                  |    8 ++--
 arch/avr32/mach-at32ap/pio.c                     |    4 +-
 arch/blackfin/include/asm/ipipe.h                |    4 +-
 arch/blackfin/mach-common/ints-priority.c        |   41 ++++++++++++++++-------
 arch/cris/arch-v10/kernel/irq.c                  |    2 -
 arch/frv/kernel/irq-mb93091.c                    |    8 ++--
 arch/frv/kernel/irq-mb93093.c                    |    8 ++--
 arch/frv/kernel/irq-mb93493.c                    |    6 +--
 arch/frv/kernel/irq.c                            |    8 ++--
 arch/ia64/hp/sim/hpsim_irq.c                     |    6 ++-
 arch/ia64/kernel/iosapic.c                       |   27 +++++++++++----
 arch/ia64/kernel/irq_lsapic.c                    |    7 +++
 arch/ia64/kernel/msi_ia64.c                      |    2 -
 arch/ia64/sn/kernel/irq.c                        |    6 +--
 arch/ia64/sn/kernel/msi_sn.c                     |    2 -
 arch/m32r/platforms/m32104ut/setup.c             |    2 -
 arch/m32r/platforms/m32700ut/setup.c             |    2 -
 arch/m32r/platforms/mappi/setup.c                |    2 -
 arch/m32r/platforms/mappi2/setup.c               |    2 -
 arch/m32r/platforms/mappi3/setup.c               |    2 -
 arch/m32r/platforms/oaks32r/setup.c              |    2 -
 arch/m32r/platforms/opsput/setup.c               |    8 ++--
 arch/m32r/platforms/usrv/setup.c                 |    4 +-
 arch/m68knommu/platform/5249/intc2.c             |    6 +--
 arch/m68knommu/platform/5272/intc.c              |    6 +--
 arch/m68knommu/platform/68328/ints.c             |    4 +-
 arch/m68knommu/platform/68360/ints.c             |    6 +--
 arch/m68knommu/platform/coldfire/intc-2.c        |    4 +-
 arch/m68knommu/platform/coldfire/intc-simr.c     |    4 +-
 arch/m68knommu/platform/coldfire/intc.c          |    4 +-
 arch/microblaze/kernel/intc.c                    |    8 ++--
 arch/mips/alchemy/common/irq.c                   |   16 ++++----
 arch/mips/alchemy/devboards/pb1200/irqmap.c      |    6 +--
 arch/mips/ar7/irq.c                              |   12 +++---
 arch/mips/bcm63xx/irq.c                          |   17 ++++++---
 arch/mips/cavium-octeon/octeon-irq.c             |   40 +++++++++++++++-------
 arch/mips/dec/ioasic-irq.c                       |    6 +--
 arch/mips/dec/kn02-irq.c                         |    6 +--
 arch/mips/emma/markeins/irq.c                    |   16 ++++----
 arch/mips/jazz/irq.c                             |    4 +-
 arch/mips/kernel/i8259.c                         |   16 ++++++--
 arch/mips/kernel/irq-gic.c                       |    6 +--
 arch/mips/kernel/irq-gt641xx.c                   |    8 ++--
 arch/mips/kernel/irq-msc01.c                     |    8 ++--
 arch/mips/kernel/irq-rm7000.c                    |    4 +-
 arch/mips/kernel/irq-rm9000.c                    |    4 +-
 arch/mips/kernel/irq_cpu.c                       |    6 +--
 arch/mips/kernel/irq_txx9.c                      |    6 +--
 arch/mips/lasat/interrupt.c                      |    4 +-
 arch/mips/loongson/common/bonito-irq.c           |    4 +-
 arch/mips/nxp/pnx833x/common/interrupts.c        |    4 +-
 arch/mips/nxp/pnx8550/common/int.c               |    4 +-
 arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c       |    4 +-
 arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c       |    6 +--
 arch/mips/powertv/asic/irq_asic.c                |    4 +-
 arch/mips/rb532/irq.c                            |    6 +--
 arch/mips/sgi-ip22/ip22-int.c                    |   16 ++++----
 arch/mips/sgi-ip27/ip27-irq.c                    |    4 +-
 arch/mips/sgi-ip27/ip27-timer.c                  |    4 +-
 arch/mips/sgi-ip32/ip32-irq.c                    |   22 ++++++------
 arch/mips/sibyte/bcm1480/irq.c                   |   12 +++---
 arch/mips/sibyte/sb1250/irq.c                    |   12 +++---
 arch/mips/sni/a20r.c                             |    4 +-
 arch/mips/sni/pcimt.c                            |    4 +-
 arch/mips/sni/pcit.c                             |    4 +-
 arch/mips/sni/rm200.c                            |   12 +++---
 arch/mips/txx9/generic/irq_tx4939.c              |    4 +-
 arch/mips/txx9/jmr3927/irq.c                     |    4 +-
 arch/mips/txx9/rbtx4927/irq.c                    |    8 ++--
 arch/mips/txx9/rbtx4938/irq.c                    |    8 ++--
 arch/mips/txx9/rbtx4939/irq.c                    |    4 +-
 arch/mips/vr41xx/common/icu.c                    |    8 ++--
 arch/mips/vr41xx/common/irq.c                    |    8 ++--
 arch/mn10300/kernel/irq.c                        |   26 ++++++++++----
 arch/mn10300/kernel/mn10300-serial.c             |    4 +-
 arch/parisc/include/asm/irq.h                    |    4 +-
 arch/parisc/kernel/irq.c                         |    4 +-
 arch/powerpc/include/asm/mpic.h                  |    6 +--
 arch/powerpc/include/asm/qe_ic.h                 |    6 +--
 arch/powerpc/kernel/crash.c                      |    2 -
 arch/powerpc/platforms/512x/mpc5121_ads_cpld.c   |    4 +-
 arch/powerpc/platforms/52xx/media5200.c          |   10 ++---
 arch/powerpc/platforms/52xx/mpc52xx_pic.c        |   10 ++---
 arch/powerpc/platforms/82xx/pq2ads-pci-pic.c     |    4 +-
 arch/powerpc/platforms/85xx/ksi8560.c            |    2 -
 arch/powerpc/platforms/85xx/mpc85xx_ads.c        |    2 -
 arch/powerpc/platforms/85xx/mpc85xx_ds.c         |    2 -
 arch/powerpc/platforms/85xx/sbc8560.c            |    2 -
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c  |   12 +++---
 arch/powerpc/platforms/85xx/stx_gp3.c            |    2 -
 arch/powerpc/platforms/85xx/tqm85xx.c            |    2 -
 arch/powerpc/platforms/86xx/gef_pic.c            |    8 ++--
 arch/powerpc/platforms/86xx/pic.c                |    2 -
 arch/powerpc/platforms/8xx/m8xx_setup.c          |    4 +-
 arch/powerpc/platforms/cell/axon_msi.c           |    9 +++--
 arch/powerpc/platforms/cell/beat_interrupt.c     |    4 +-
 arch/powerpc/platforms/cell/interrupt.c          |   12 +++---
 arch/powerpc/platforms/cell/setup.c              |    2 -
 arch/powerpc/platforms/cell/spider-pic.c         |    8 ++--
 arch/powerpc/platforms/chrp/setup.c              |    2 -
 arch/powerpc/platforms/embedded6xx/flipper-pic.c |    8 ++--
 arch/powerpc/platforms/embedded6xx/hlwd-pic.c    |   14 +++----
 arch/powerpc/platforms/iseries/irq.c             |    6 +--
 arch/powerpc/platforms/powermac/pic.c            |   10 ++---
 arch/powerpc/platforms/ps3/interrupt.c           |    6 +--
 arch/powerpc/platforms/pseries/setup.c           |    2 -
 arch/powerpc/platforms/pseries/xics.c            |    8 ++--
 arch/powerpc/sysdev/cpm1.c                       |    6 +--
 arch/powerpc/sysdev/cpm2_pic.c                   |    8 ++--
 arch/powerpc/sysdev/fsl_msi.c                    |   12 +++---
 arch/powerpc/sysdev/i8259.c                      |    6 +--
 arch/powerpc/sysdev/ipic.c                       |    8 ++--
 arch/powerpc/sysdev/mpc8xx_pic.c                 |    8 ++--
 arch/powerpc/sysdev/mpic.c                       |   16 ++++----
 arch/powerpc/sysdev/mpic_pasemi_msi.c            |    4 +-
 arch/powerpc/sysdev/mpic_u3msi.c                 |   19 ++++++----
 arch/powerpc/sysdev/mv64x60_pic.c                |   14 +++----
 arch/powerpc/sysdev/qe_lib/qe_ic.c               |    4 +-
 arch/powerpc/sysdev/tsi108_pci.c                 |   10 ++---
 arch/powerpc/sysdev/uic.c                        |   16 ++++----
 arch/powerpc/sysdev/xilinx_intc.c                |   10 ++---
 arch/score/kernel/irq.c                          |    4 +-
 arch/sh/boards/mach-cayman/irq.c                 |    6 +--
 arch/sh/boards/mach-dreamcast/irq.c              |    6 +--
 arch/sh/boards/mach-landisk/irq.c                |    4 +-
 arch/sh/boards/mach-microdev/irq.c               |   14 +++----
 arch/sh/boards/mach-se/7206/irq.c                |    6 +--
 arch/sh/boards/mach-se/7343/irq.c                |    4 +-
 arch/sh/boards/mach-se/7722/irq.c                |    4 +-
 arch/sh/boards/mach-se/7724/irq.c                |    4 +-
 arch/sh/boards/mach-systemh/irq.c                |   14 +++----
 arch/sh/cchips/hd6446x/hd64461.c                 |    8 ++--
 arch/sh/kernel/cpu/irq/imask.c                   |    4 +-
 arch/sh/kernel/cpu/irq/intc-sh5.c                |   14 +++----
 arch/sparc/kernel/irq_64.c                       |    6 +--
 arch/sparc/kernel/pci_msi.c                      |   13 ++++++-
 arch/um/kernel/irq.c                             |    8 +++-
 arch/x86/include/asm/hpet.h                      |    4 +-
 arch/x86/kernel/apic/io_apic.c                   |   31 ++++++-----------
 arch/x86/kernel/hpet.c                           |    4 +-
 arch/x86/kernel/i8259.c                          |   19 +++++++---
 arch/x86/kernel/irq.c                            |    4 +-
 arch/x86/kernel/uv_irq.c                         |   10 +++--
 arch/x86/kernel/visws_quirks.c                   |    2 -
 arch/x86/kernel/vmiclock_32.c                    |    6 +--
 arch/x86/lguest/boot.c                           |    4 +-
 arch/xtensa/kernel/irq.c                         |   10 ++---
 arch/xtensa/variants/s6000/gpio.c                |   12 +++---
 drivers/dma/ipu/ipu_irq.c                        |    6 +--
 drivers/gpio/langwell_gpio.c                     |    6 +--
 drivers/gpio/pl061.c                             |    8 ++--
 drivers/gpio/timbgpio.c                          |    6 +--
 drivers/gpio/vr41xx_giu.c                        |   16 ++++----
 drivers/mfd/asic3.c                              |   10 ++---
 drivers/mfd/ezx-pcap.c                           |    6 +--
 drivers/mfd/htc-egpio.c                          |    6 +--
 drivers/mfd/t7l66xb.c                            |    4 +-
 drivers/mfd/tc6393xb.c                           |    6 +--
 drivers/mfd/twl4030-irq.c                        |    4 +-
 drivers/mfd/wm831x-irq.c                         |    4 +-
 drivers/misc/sgi-gru/grufile.c                   |    2 -
 drivers/pci/dmar.c                               |    4 +-
 drivers/pci/htirq.c                              |    4 +-
 drivers/pci/msi.c                                |    4 +-
 drivers/vlynq/vlynq.c                            |    8 ++--
 drivers/xen/events.c                             |   18 ++++++++--
 include/linux/dmar.h                             |    4 +-
 include/linux/htirq.h                            |    5 +-
 include/linux/irq.h                              |   18 +++++-----
 include/linux/msi.h                              |    4 +-
 kernel/irq/chip.c                                |   26 +++++++-------
 kernel/irq/handle.c                              |   18 +++++-----
 kernel/irq/manage.c                              |    2 -
 kernel/irq/migration.c                           |   14 ++-----
 281 files changed, 1242 insertions(+), 1042 deletions(-)
Documentation/DocBook/genericirq.tmpl +6 -6
Index: linux-2.6/Documentation/DocBook/genericirq.tmpl
===================================================================
@@ -235,27 +235,27 @@
 		<programlisting>
 default_enable(irq)
 {
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 default_disable(irq)
 {
 	if (!delay_disable(irq))
-		desc->chip->mask(irq);
+		desc->chip->mask(irq, desc);
 }
 
 default_ack(irq)
 {
-	chip->ack(irq);
+	chip->ack(irq, desc);
 }
 
 default_mask_ack(irq)
 {
 	if (chip->mask_ack) {
-		chip->mask_ack(irq);
+		chip->mask_ack(irq, irq_to_desc(irq));
 	} else {
-		chip->mask(irq);
-		chip->ack(irq);
+		chip->mask(irq, irq_to_desc(irq));
+		chip->ack(irq, irq_to_desc(irq));
 	}
 }
 
arch/alpha/kernel/irq_alpha.c +2 -1
Index: linux-2.6/arch/alpha/kernel/irq_alpha.c
===================================================================
@@ -219,6 +219,7 @@ process_mcheck_info(unsigned long vector
  */
 
 static void rtc_enable_disable(unsigned int irq) { }
+static void rtc_enable_disable_desc(unsigned int irq, struct irq_desc *desc) { }
 static unsigned int rtc_startup(unsigned int irq) { return 0; }
 
 struct irqaction timer_irqaction = {
@@ -233,7 +234,7 @@ static struct irq_chip rtc_irq_type = {
 	.shutdown	= rtc_enable_disable,
 	.enable		= rtc_enable_disable,
 	.disable	= rtc_enable_disable,
-	.ack		= rtc_enable_disable,
+	.ack		= rtc_enable_disable_desc,
 	.end		= rtc_enable_disable,
 };
 
arch/alpha/kernel/irq_i8259.c +6 -1
Index: linux-2.6/arch/alpha/kernel/irq_i8259.c
===================================================================
@@ -69,6 +69,11 @@ i8259a_mask_and_ack_irq(unsigned int irq
 	spin_unlock(&i8259_irq_lock);
 }
 
+static void i8259a_mask_and_ack_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	i8259a_mask_and_ack_irq(irq);
+}
+
 unsigned int
 i8259a_startup_irq(unsigned int irq)
 {
@@ -89,7 +94,7 @@ struct irq_chip i8259a_irq_type = {
 	.shutdown	= i8259a_disable_irq,
 	.enable		= i8259a_enable_irq,
 	.disable	= i8259a_disable_irq,
-	.ack		= i8259a_mask_and_ack_irq,
+	.ack		= i8259a_mask_and_ack_irq_desc,
 	.end		= i8259a_end_irq,
 };
 
arch/alpha/kernel/irq_pyxis.c +1 -1
Index: linux-2.6/arch/alpha/kernel/irq_pyxis.c
===================================================================
@@ -55,7 +55,7 @@ pyxis_end_irq(unsigned int irq)
 }
 
 static void
-pyxis_mask_and_ack_irq(unsigned int irq)
+pyxis_mask_and_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned long bit = 1UL << (irq - 16);
 	unsigned long mask = cached_irq_mask &= ~bit;
arch/alpha/kernel/irq_srm.c +7 -1
Index: linux-2.6/arch/alpha/kernel/irq_srm.c
===================================================================
@@ -33,6 +33,12 @@ srm_disable_irq(unsigned int irq)
 	spin_unlock(&srm_irq_lock);
 }
 
+static void
+srm_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	srm_disable_irq(irq);
+}
+
 static unsigned int
 srm_startup_irq(unsigned int irq)
 {
@@ -54,7 +60,7 @@ static struct irq_chip srm_irq_type = {
 	.shutdown	= srm_disable_irq,
 	.enable		= srm_enable_irq,
 	.disable	= srm_disable_irq,
-	.ack		= srm_disable_irq,
+	.ack		= srm_disable_irq_desc,
 	.end		= srm_end_irq,
 };
 
arch/alpha/kernel/sys_alcor.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_alcor.c
===================================================================
@@ -73,7 +73,7 @@ alcor_startup_irq(unsigned int irq)
 }
 
 static void
-alcor_isa_mask_and_ack_irq(unsigned int irq)
+alcor_isa_mask_and_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	i8259a_mask_and_ack_irq(irq);
 
arch/alpha/kernel/sys_cabriolet.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_cabriolet.c
===================================================================
@@ -57,6 +57,12 @@ cabriolet_disable_irq(unsigned int irq)
 	cabriolet_update_irq_hw(irq, cached_irq_mask |= 1UL << irq);
 }
 
+static void
+cabriolet_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	cabriolet_disable_irq(irq);
+}
+
 static unsigned int
 cabriolet_startup_irq(unsigned int irq)
 { 
@@ -77,7 +83,7 @@ static struct irq_chip cabriolet_irq_typ
 	.shutdown	= cabriolet_disable_irq,
 	.enable		= cabriolet_enable_irq,
 	.disable	= cabriolet_disable_irq,
-	.ack		= cabriolet_disable_irq,
+	.ack		= cabriolet_disable_irq_desc,
 	.end		= cabriolet_end_irq,
 };
 
arch/alpha/kernel/sys_dp264.c +14 -2
Index: linux-2.6/arch/alpha/kernel/sys_dp264.c
===================================================================
@@ -115,6 +115,12 @@ dp264_disable_irq(unsigned int irq)
 	spin_unlock(&dp264_irq_lock);
 }
 
+static void
+dp264_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	dp264_disable_irq(irq);
+}
+
 static unsigned int
 dp264_startup_irq(unsigned int irq)
 { 
@@ -147,6 +153,12 @@ clipper_disable_irq(unsigned int irq)
 	spin_unlock(&dp264_irq_lock);
 }
 
+static void
+clipper_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	clipper_disable_irq(irq);
+}
+
 static unsigned int
 clipper_startup_irq(unsigned int irq)
 { 
@@ -204,7 +216,7 @@ static struct irq_chip dp264_irq_type =
 	.shutdown	= dp264_disable_irq,
 	.enable		= dp264_enable_irq,
 	.disable	= dp264_disable_irq,
-	.ack		= dp264_disable_irq,
+	.ack		= dp264_disable_irq_desc,
 	.end		= dp264_end_irq,
 	.set_affinity	= dp264_set_affinity,
 };
@@ -215,7 +227,7 @@ static struct irq_chip clipper_irq_type
 	.shutdown	= clipper_disable_irq,
 	.enable		= clipper_enable_irq,
 	.disable	= clipper_disable_irq,
-	.ack		= clipper_disable_irq,
+	.ack		= clipper_disable_irq_desc,
 	.end		= clipper_end_irq,
 	.set_affinity	= clipper_set_affinity,
 };
arch/alpha/kernel/sys_eb64p.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_eb64p.c
===================================================================
@@ -55,6 +55,12 @@ eb64p_disable_irq(unsigned int irq)
 	eb64p_update_irq_hw(irq, cached_irq_mask |= 1 << irq);
 }
 
+static void
+eb64p_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	eb64p_disable_irq(irq);
+}
+
 static unsigned int
 eb64p_startup_irq(unsigned int irq)
 {
@@ -75,7 +81,7 @@ static struct irq_chip eb64p_irq_type =
 	.shutdown	= eb64p_disable_irq,
 	.enable		= eb64p_enable_irq,
 	.disable	= eb64p_disable_irq,
-	.ack		= eb64p_disable_irq,
+	.ack		= eb64p_disable_irq_desc,
 	.end		= eb64p_end_irq,
 };
 
arch/alpha/kernel/sys_eiger.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_eiger.c
===================================================================
@@ -66,6 +66,12 @@ eiger_disable_irq(unsigned int irq)
 	eiger_update_irq_hw(irq, mask);
 }
 
+static void
+eiger_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	eiger_disable_irq(irq);
+}
+
 static unsigned int
 eiger_startup_irq(unsigned int irq)
 {
@@ -86,7 +92,7 @@ static struct irq_chip eiger_irq_type =
 	.shutdown	= eiger_disable_irq,
 	.enable		= eiger_enable_irq,
 	.disable	= eiger_disable_irq,
-	.ack		= eiger_disable_irq,
+	.ack		= eiger_disable_irq_desc,
 	.end		= eiger_end_irq,
 };
 
arch/alpha/kernel/sys_jensen.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_jensen.c
===================================================================
@@ -103,7 +103,7 @@ jensen_local_disable(unsigned int irq)
 }
 
 static void
-jensen_local_ack(unsigned int irq)
+jensen_local_ack(unsigned int irq, struct irq_desc *desc)
 {
 	/* the parport is really hw IRQ 1, silly Jensen.  */
 	if (irq == 7)
arch/alpha/kernel/sys_marvel.c +14 -4
Index: linux-2.6/arch/alpha/kernel/sys_marvel.c
===================================================================
@@ -143,7 +143,12 @@ io7_disable_irq(unsigned int irq)
 	spin_unlock(&io7->irq_lock);
 }
 
-static unsigned int
+static void
+io7_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	io7_disable_irq(irq)
+}
+
 io7_startup_irq(unsigned int irq)
 {
 	io7_enable_irq(irq);
@@ -163,6 +168,11 @@ marvel_irq_noop(unsigned int irq)
 	return; 
 }
 
+static void
+marvel_irq_noop_desc(unsigned int irq, struct irq_desc *desc)
+{
+}
+
 static unsigned int
 marvel_irq_noop_return(unsigned int irq) 
 { 
@@ -175,7 +185,7 @@ static struct irq_chip marvel_legacy_irq
 	.shutdown	= marvel_irq_noop,
 	.enable		= marvel_irq_noop,
 	.disable	= marvel_irq_noop,
-	.ack		= marvel_irq_noop,
+	.ack		= marvel_irq_noop_desc,
 	.end		= marvel_irq_noop,
 };
 
@@ -185,7 +195,7 @@ static struct irq_chip io7_lsi_irq_type
 	.shutdown	= io7_disable_irq,
 	.enable		= io7_enable_irq,
 	.disable	= io7_disable_irq,
-	.ack		= io7_disable_irq,
+	.ack		= io7_disable_irq_desc,
 	.end		= io7_end_irq,
 };
 
@@ -195,7 +205,7 @@ static struct irq_chip io7_msi_irq_type
 	.shutdown	= io7_disable_irq,
 	.enable		= io7_enable_irq,
 	.disable	= io7_disable_irq,
-	.ack		= marvel_irq_noop,
+	.ack		= marvel_irq_noop_desc,
 	.end		= io7_end_irq,
 };
 
arch/alpha/kernel/sys_mikasa.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_mikasa.c
===================================================================
@@ -54,6 +54,12 @@ mikasa_disable_irq(unsigned int irq)
 	mikasa_update_irq_hw(cached_irq_mask &= ~(1 << (irq - 16)));
 }
 
+static void
+mikasa_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	mikasa_disable_irq(irq);
+}
+
 static unsigned int
 mikasa_startup_irq(unsigned int irq)
 {
@@ -74,7 +80,7 @@ static struct irq_chip mikasa_irq_type =
 	.shutdown	= mikasa_disable_irq,
 	.enable		= mikasa_enable_irq,
 	.disable	= mikasa_disable_irq,
-	.ack		= mikasa_disable_irq,
+	.ack		= mikasa_disable_irq_desc,
 	.end		= mikasa_end_irq,
 };
 
arch/alpha/kernel/sys_noritake.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_noritake.c
===================================================================
@@ -59,6 +59,12 @@ noritake_disable_irq(unsigned int irq)
 	noritake_update_irq_hw(irq, cached_irq_mask &= ~(1 << (irq - 16)));
 }
 
+static void
+noritake_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	noritake_disable_irq(irq);
+}
+
 static unsigned int
 noritake_startup_irq(unsigned int irq)
 {
@@ -79,7 +85,7 @@ static struct irq_chip noritake_irq_type
 	.shutdown	= noritake_disable_irq,
 	.enable		= noritake_enable_irq,
 	.disable	= noritake_disable_irq,
-	.ack		= noritake_disable_irq,
+	.ack		= noritake_disable_irq_desc,
 	.end		= noritake_end_irq,
 };
 
arch/alpha/kernel/sys_rawhide.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_rawhide.c
===================================================================
@@ -96,7 +96,7 @@ rawhide_disable_irq(unsigned int irq)
 }
 
 static void
-rawhide_mask_and_ack_irq(unsigned int irq)
+rawhide_mask_and_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask, mask1, hose;
 
arch/alpha/kernel/sys_rx164.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_rx164.c
===================================================================
@@ -58,6 +58,12 @@ rx164_disable_irq(unsigned int irq)
 	rx164_update_irq_hw(cached_irq_mask &= ~(1UL << (irq - 16)));
 }
 
+static void
+rx164_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	rx164_disable_irq(irq);
+}
+
 static unsigned int
 rx164_startup_irq(unsigned int irq)
 {
@@ -78,7 +84,7 @@ static struct irq_chip rx164_irq_type =
 	.shutdown	= rx164_disable_irq,
 	.enable		= rx164_enable_irq,
 	.disable	= rx164_disable_irq,
-	.ack		= rx164_disable_irq,
+	.ack		= rx164_disable_irq_desc,
 	.end		= rx164_end_irq,
 };
 
arch/alpha/kernel/sys_sable.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_sable.c
===================================================================
@@ -489,7 +489,7 @@ sable_lynx_end_irq(unsigned int irq)
 }
 
 static void
-sable_lynx_mask_and_ack_irq(unsigned int irq)
+sable_lynx_mask_and_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned long bit, mask;
 
arch/alpha/kernel/sys_takara.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_takara.c
===================================================================
@@ -60,6 +60,12 @@ takara_disable_irq(unsigned int irq)
 	takara_update_irq_hw(irq, mask);
 }
 
+static void
+takara_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	takara_disable_irq(irq);
+}
+
 static unsigned int
 takara_startup_irq(unsigned int irq)
 {
@@ -80,7 +86,7 @@ static struct irq_chip takara_irq_type =
 	.shutdown	= takara_disable_irq,
 	.enable		= takara_enable_irq,
 	.disable	= takara_disable_irq,
-	.ack		= takara_disable_irq,
+	.ack		= takara_disable_irq_desc,
 	.end		= takara_end_irq,
 };
 
arch/alpha/kernel/sys_titan.c +7 -1
Index: linux-2.6/arch/alpha/kernel/sys_titan.c
===================================================================
@@ -129,6 +129,12 @@ titan_disable_irq(unsigned int irq)
 	spin_unlock(&titan_irq_lock);
 }
 
+static void
+titan_disable_irq_desc(unsigned int irq, struct irq_desc *desc)
+{
+	titan_disable_irq(irq);
+}
+
 static unsigned int
 titan_startup_irq(unsigned int irq)
 {
@@ -200,7 +206,7 @@ static struct irq_chip titan_irq_type =
        .shutdown       = titan_disable_irq,
        .enable         = titan_enable_irq,
        .disable        = titan_disable_irq,
-       .ack            = titan_disable_irq,
+       .ack            = titan_disable_irq_desc,
        .end            = titan_end_irq,
        .set_affinity   = titan_set_irq_affinity,
 };
arch/alpha/kernel/sys_wildfire.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_wildfire.c
===================================================================
@@ -128,7 +128,7 @@ wildfire_disable_irq(unsigned int irq)
 }
 
 static void
-wildfire_mask_and_ack_irq(unsigned int irq)
+wildfire_mask_and_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	if (irq < 16)
 		i8259a_mask_and_ack_irq(irq);
arch/arm/common/gic.c +5 -5
Index: linux-2.6/arch/arm/common/gic.c
===================================================================
@@ -80,7 +80,7 @@ static inline unsigned int gic_irq(unsig
  * our "acknowledge" routine disable the interrupt, then mark it as
  * complete.
  */
-static void gic_ack_irq(unsigned int irq)
+static void gic_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	u32 mask = 1 << (irq % 32);
 
@@ -90,7 +90,7 @@ static void gic_ack_irq(unsigned int irq
 	spin_unlock(&irq_controller_lock);
 }
 
-static void gic_mask_irq(unsigned int irq)
+static void gic_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	u32 mask = 1 << (irq % 32);
 
@@ -99,7 +99,7 @@ static void gic_mask_irq(unsigned int ir
 	spin_unlock(&irq_controller_lock);
 }
 
-static void gic_unmask_irq(unsigned int irq)
+static void gic_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	u32 mask = 1 << (irq % 32);
 
@@ -135,7 +135,7 @@ static void gic_handle_cascade_irq(unsig
 	unsigned long status;
 
 	/* primary controller ack'ing */
-	chip->ack(irq);
+	chip->ack(irq, desc);
 
 	spin_lock(&irq_controller_lock);
 	status = readl(chip_data->cpu_base + GIC_CPU_INTACK);
@@ -153,7 +153,7 @@ static void gic_handle_cascade_irq(unsig
 
  out:
 	/* primary controller unmasking */
-	chip->unmask(irq);
+	chip->unmask(irq, desc);
 }
 
 static struct irq_chip gic_chip = {
arch/arm/common/it8152.c +2 -2
Index: linux-2.6/arch/arm/common/it8152.c
===================================================================
@@ -32,7 +32,7 @@
 
 #define MAX_SLOTS		21
 
-static void it8152_mask_irq(unsigned int irq)
+static void it8152_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
        if (irq >= IT8152_LD_IRQ(0)) {
 	       __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) |
@@ -49,7 +49,7 @@ static void it8152_mask_irq(unsigned int
        }
 }
 
-static void it8152_unmask_irq(unsigned int irq)
+static void it8152_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
        if (irq >= IT8152_LD_IRQ(0)) {
 	       __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) &
arch/arm/common/locomo.c +16 -16
Index: linux-2.6/arch/arm/common/locomo.c
===================================================================
@@ -172,7 +172,7 @@ static void locomo_handler(unsigned int
 	void __iomem *mapbase = get_irq_chip_data(irq);
 
 	/* Acknowledge the parent IRQ */
-	desc->chip->ack(irq);
+	desc->chip->ack(irq, desc);
 
 	/* check why this interrupt was generated */
 	req = locomo_readl(mapbase + LOCOMO_ICR) & 0x0f00;
@@ -189,11 +189,11 @@ static void locomo_handler(unsigned int
 	}
 }
 
-static void locomo_ack_irq(unsigned int irq)
+static void locomo_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 }
 
-static void locomo_mask_irq(unsigned int irq)
+static void locomo_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -202,7 +202,7 @@ static void locomo_mask_irq(unsigned int
 	locomo_writel(r, mapbase + LOCOMO_ICR);
 }
 
-static void locomo_unmask_irq(unsigned int irq)
+static void locomo_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -227,7 +227,7 @@ static void locomo_key_handler(unsigned
 	}
 }
 
-static void locomo_key_ack_irq(unsigned int irq)
+static void locomo_key_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -236,7 +236,7 @@ static void locomo_key_ack_irq(unsigned
 	locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
 }
 
-static void locomo_key_mask_irq(unsigned int irq)
+static void locomo_key_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -245,7 +245,7 @@ static void locomo_key_mask_irq(unsigned
 	locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
 }
 
-static void locomo_key_unmask_irq(unsigned int irq)
+static void locomo_key_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -280,7 +280,7 @@ static void locomo_gpio_handler(unsigned
 	}
 }
 
-static void locomo_gpio_ack_irq(unsigned int irq)
+static void locomo_gpio_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -297,7 +297,7 @@ static void locomo_gpio_ack_irq(unsigned
 	locomo_writel(r, mapbase + LOCOMO_GWE);
 }
 
-static void locomo_gpio_mask_irq(unsigned int irq)
+static void locomo_gpio_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -306,7 +306,7 @@ static void locomo_gpio_mask_irq(unsigne
 	locomo_writel(r, mapbase + LOCOMO_GIE);
 }
 
-static void locomo_gpio_unmask_irq(unsigned int irq)
+static void locomo_gpio_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -362,7 +362,7 @@ static void locomo_lt_handler(unsigned i
 	}
 }
 
-static void locomo_lt_ack_irq(unsigned int irq)
+static void locomo_lt_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -371,7 +371,7 @@ static void locomo_lt_ack_irq(unsigned i
 	locomo_writel(r, mapbase + LOCOMO_LTINT);
 }
 
-static void locomo_lt_mask_irq(unsigned int irq)
+static void locomo_lt_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -380,7 +380,7 @@ static void locomo_lt_mask_irq(unsigned
 	locomo_writel(r, mapbase + LOCOMO_LTINT);
 }
 
-static void locomo_lt_unmask_irq(unsigned int irq)
+static void locomo_lt_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -413,7 +413,7 @@ static void locomo_spi_handler(unsigned
 	}
 }
 
-static void locomo_spi_ack_irq(unsigned int irq)
+static void locomo_spi_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -430,7 +430,7 @@ static void locomo_spi_ack_irq(unsigned
 	locomo_writel(r, mapbase + LOCOMO_SPI + LOCOMO_SPIWE);
 }
 
-static void locomo_spi_mask_irq(unsigned int irq)
+static void locomo_spi_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
@@ -439,7 +439,7 @@ static void locomo_spi_mask_irq(unsigned
 	locomo_writel(r, mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
 }
 
-static void locomo_spi_unmask_irq(unsigned int irq)
+static void locomo_spi_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned int r;
arch/arm/common/sa1111.c +7 -7
Index: linux-2.6/arch/arm/common/sa1111.c
===================================================================
@@ -159,7 +159,7 @@ sa1111_irq_handler(unsigned int irq, str
 
 	sa1111_writel(stat0, base + SA1111_INTSTATCLR0);
 
-	desc->chip->ack(irq);
+	desc->chip->ack(irq, desc);
 
 	sa1111_writel(stat1, base + SA1111_INTSTATCLR1);
 
@@ -177,17 +177,17 @@ sa1111_irq_handler(unsigned int irq, str
 			handle_edge_irq(i, irq_desc + i);
 
 	/* For level-based interrupts */
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 #define SA1111_IRQMASK_LO(x)	(1 << (x - IRQ_SA1111_START))
 #define SA1111_IRQMASK_HI(x)	(1 << (x - IRQ_SA1111_START - 32))
 
-static void sa1111_ack_irq(unsigned int irq)
+static void sa1111_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 }
 
-static void sa1111_mask_lowirq(unsigned int irq)
+static void sa1111_mask_lowirq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned long ie0;
@@ -197,7 +197,7 @@ static void sa1111_mask_lowirq(unsigned
 	writel(ie0, mapbase + SA1111_INTEN0);
 }
 
-static void sa1111_unmask_lowirq(unsigned int irq)
+static void sa1111_unmask_lowirq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned long ie0;
@@ -284,7 +284,7 @@ static struct irq_chip sa1111_low_chip =
 	.set_wake	= sa1111_wake_lowirq,
 };
 
-static void sa1111_mask_highirq(unsigned int irq)
+static void sa1111_mask_highirq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned long ie1;
@@ -294,7 +294,7 @@ static void sa1111_mask_highirq(unsigned
 	sa1111_writel(ie1, mapbase + SA1111_INTEN1);
 }
 
-static void sa1111_unmask_highirq(unsigned int irq)
+static void sa1111_unmask_highirq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *mapbase = get_irq_chip_data(irq);
 	unsigned long ie1;
arch/arm/common/vic.c +3 -3
Index: linux-2.6/arch/arm/common/vic.c
===================================================================
@@ -28,7 +28,7 @@
 #include <asm/mach/irq.h>
 #include <asm/hardware/vic.h>
 
-static void vic_ack_irq(unsigned int irq)
+static void vic_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *base = get_irq_chip_data(irq);
 	irq &= 31;
@@ -37,14 +37,14 @@ static void vic_ack_irq(unsigned int irq
 	writel(1 << irq, base + VIC_INT_SOFT_CLEAR);
 }
 
-static void vic_mask_irq(unsigned int irq)
+static void vic_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *base = get_irq_chip_data(irq);
 	irq &= 31;
 	writel(1 << irq, base + VIC_INT_ENABLE_CLEAR);
 }
 
-static void vic_unmask_irq(unsigned int irq)
+static void vic_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	void __iomem *base = get_irq_chip_data(irq);
 	irq &= 31;
arch/arm/kernel/ecard.c +5 -5
Index: linux-2.6/arch/arm/kernel/ecard.c
===================================================================
@@ -443,7 +443,7 @@ static expansioncard_ops_t ecard_default
  *
  * They are not meant to be called directly, but via enable/disable_irq.
  */
-static void ecard_irq_unmask(unsigned int irqnr)
+static void ecard_irq_unmask(unsigned int irqnr, struct irq_desc *desc)
 {
 	ecard_t *ec = slot_to_ecard(irqnr - 32);
 
@@ -459,7 +459,7 @@ static void ecard_irq_unmask(unsigned in
 	}
 }
 
-static void ecard_irq_mask(unsigned int irqnr)
+static void ecard_irq_mask(unsigned int irqnr, struct irq_desc *desc)
 {
 	ecard_t *ec = slot_to_ecard(irqnr - 32);
 
@@ -551,7 +551,7 @@ static void ecard_check_lockup(struct ir
 			printk(KERN_ERR "\nInterrupt lockup detected - "
 			       "disabling all expansion card interrupts\n");
 
-			desc->chip->mask(IRQ_EXPANSIONCARD);
+			desc->chip->mask(IRQ_EXPANSIONCARD, irq_to_desc(IRQ_EXPANSIONCARD));
 			ecard_dump_irq_state();
 		}
 	} else
@@ -574,7 +574,7 @@ ecard_irq_handler(unsigned int irq, stru
 	ecard_t *ec;
 	int called = 0;
 
-	desc->chip->mask(irq);
+	desc->chip->mask(irq, desc);
 	for (ec = cards; ec; ec = ec->next) {
 		int pending;
 
@@ -591,7 +591,7 @@ ecard_irq_handler(unsigned int irq, stru
 			called ++;
 		}
 	}
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 
 	if (called == 0)
 		ecard_check_lockup(desc);
arch/arm/mach-aaec2000/core.c +3 -3
Index: linux-2.6/arch/arm/mach-aaec2000/core.c
===================================================================
@@ -67,17 +67,17 @@ void __init aaec2000_map_io(void)
 /*
  * Interrupt handling routines
  */
-static void aaec2000_int_ack(unsigned int irq)
+static void aaec2000_int_ack(unsigned int irq, struct irq_desc *desc)
 {
 	IRQ_INTSR = 1 << irq;
 }
 
-static void aaec2000_int_mask(unsigned int irq)
+static void aaec2000_int_mask(unsigned int irq, struct irq_desc *desc)
 {
 	IRQ_INTENC |= (1 << irq);
 }
 
-static void aaec2000_int_unmask(unsigned int irq)
+static void aaec2000_int_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	IRQ_INTENS |= (1 << irq);
 }
arch/arm/mach-at91/gpio.c +4 -4
Index: linux-2.6/arch/arm/mach-at91/gpio.c
===================================================================
@@ -344,7 +344,7 @@ void at91_gpio_resume(void)
  * IRQ0..IRQ6 should be configurable, e.g. level vs edge triggering.
  */
 
-static void gpio_irq_mask(unsigned pin)
+static void gpio_irq_mask(unsigned pin, struct irq_desc *desc)
 {
 	void __iomem	*pio = pin_to_controller(pin);
 	unsigned	mask = pin_to_mask(pin);
@@ -353,7 +353,7 @@ static void gpio_irq_mask(unsigned pin)
 		__raw_writel(mask, pio + PIO_IDR);
 }
 
-static void gpio_irq_unmask(unsigned pin)
+static void gpio_irq_unmask(unsigned pin, struct irq_desc *desc)
 {
 	void __iomem	*pio = pin_to_controller(pin);
 	unsigned	mask = pin_to_mask(pin);
@@ -393,7 +393,7 @@ static void gpio_irq_handler(unsigned ir
 	pio = at91_gpio->regbase;
 
 	/* temporarily mask (level sensitive) parent IRQ */
-	desc->chip->ack(irq);
+	desc->chip->ack(irq, desc);
 	for (;;) {
 		/* Reading ISR acks pending (edge triggered) GPIO interrupts.
 		 * When there none are pending, we're finished unless we need
@@ -429,7 +429,7 @@ static void gpio_irq_handler(unsigned ir
 			isr >>= 1;
 		}
 	}
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 	/* now it may re-trigger */
 }
 
arch/arm/mach-at91/irq.c +2 -2
Index: linux-2.6/arch/arm/mach-at91/irq.c
===================================================================
@@ -34,13 +34,13 @@
 #include <asm/mach/map.h>
 
 
-static void at91_aic_mask_irq(unsigned int irq)
+static void at91_aic_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* Disable interrupt on AIC */
 	at91_sys_write(AT91_AIC_IDCR, 1 << irq);
 }
 
-static void at91_aic_unmask_irq(unsigned int irq)
+static void at91_aic_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* Enable interrupt on AIC */
 	at91_sys_write(AT91_AIC_IECR, 1 << irq);
arch/arm/mach-bcmring/irq.c +6 -6
Index: linux-2.6/arch/arm/mach-bcmring/irq.c
===================================================================
@@ -30,37 +30,37 @@
 #include <mach/csp/intcHw_reg.h>
 #include <mach/csp/mm_io.h>
 
-static void bcmring_mask_irq0(unsigned int irq)
+static void bcmring_mask_irq0(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << (irq - IRQ_INTC0_START),
 	       MM_IO_BASE_INTC0 + INTCHW_INTENCLEAR);
 }
 
-static void bcmring_unmask_irq0(unsigned int irq)
+static void bcmring_unmask_irq0(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << (irq - IRQ_INTC0_START),
 	       MM_IO_BASE_INTC0 + INTCHW_INTENABLE);
 }
 
-static void bcmring_mask_irq1(unsigned int irq)
+static void bcmring_mask_irq1(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << (irq - IRQ_INTC1_START),
 	       MM_IO_BASE_INTC1 + INTCHW_INTENCLEAR);
 }
 
-static void bcmring_unmask_irq1(unsigned int irq)
+static void bcmring_unmask_irq1(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << (irq - IRQ_INTC1_START),
 	       MM_IO_BASE_INTC1 + INTCHW_INTENABLE);
 }
 
-static void bcmring_mask_irq2(unsigned int irq)
+static void bcmring_mask_irq2(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << (irq - IRQ_SINTC_START),
 	       MM_IO_BASE_SINTC + INTCHW_INTENCLEAR);
 }
 
-static void bcmring_unmask_irq2(unsigned int irq)
+static void bcmring_unmask_irq2(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << (irq - IRQ_SINTC_START),
 	       MM_IO_BASE_SINTC + INTCHW_INTENABLE);
arch/arm/mach-clps711x/irq.c +6 -6
Index: linux-2.6/arch/arm/mach-clps711x/irq.c
===================================================================
@@ -27,7 +27,7 @@
 
 #include <asm/hardware/clps7111.h>
 
-static void int1_mask(unsigned int irq)
+static void int1_mask(unsigned int irq, struct irq_desc *desc)
 {
 	u32 intmr1;
 
@@ -36,7 +36,7 @@ static void int1_mask(unsigned int irq)
 	clps_writel(intmr1, INTMR1);
 }
 
-static void int1_ack(unsigned int irq)
+static void int1_ack(unsigned int irq, struct irq_desc *desc)
 {
 	u32 intmr1;
 
@@ -54,7 +54,7 @@ static void int1_ack(unsigned int irq)
 	}
 }
 
-static void int1_unmask(unsigned int irq)
+static void int1_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	u32 intmr1;
 
@@ -69,7 +69,7 @@ static struct irq_chip int1_chip = {
 	.unmask = int1_unmask,
 };
 
-static void int2_mask(unsigned int irq)
+static void int2_mask(unsigned int irq, struct irq_desc *desc)
 {
 	u32 intmr2;
 
@@ -78,7 +78,7 @@ static void int2_mask(unsigned int irq)
 	clps_writel(intmr2, INTMR2);
 }
 
-static void int2_ack(unsigned int irq)
+static void int2_ack(unsigned int irq, struct irq_desc *desc)
 {
 	u32 intmr2;
 
@@ -91,7 +91,7 @@ static void int2_ack(unsigned int irq)
 	}
 }
 
-static void int2_unmask(unsigned int irq)
+static void int2_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	u32 intmr2;
 
arch/arm/mach-davinci/cp_intc.c +3 -3
Index: linux-2.6/arch/arm/mach-davinci/cp_intc.c
===================================================================
@@ -27,13 +27,13 @@ static inline void cp_intc_write(unsigne
 	__raw_writel(value, cp_intc_base + offset);
 }
 
-static void cp_intc_ack_irq(unsigned int irq)
+static void cp_intc_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	cp_intc_write(irq, CP_INTC_SYS_STAT_IDX_CLR);
 }
 
 /* Disable interrupt */
-static void cp_intc_mask_irq(unsigned int irq)
+static void cp_intc_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* XXX don't know why we need to disable nIRQ here... */
 	cp_intc_write(1, CP_INTC_HOST_ENABLE_IDX_CLR);
@@ -42,7 +42,7 @@ static void cp_intc_mask_irq(unsigned in
 }
 
 /* Enable interrupt */
-static void cp_intc_unmask_irq(unsigned int irq)
+static void cp_intc_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	cp_intc_write(irq, CP_INTC_SYS_ENABLE_IDX_SET);
 }
arch/arm/mach-davinci/gpio.c +3 -3
Index: linux-2.6/arch/arm/mach-davinci/gpio.c
===================================================================
@@ -223,8 +223,8 @@ gpio_irq_handler(unsigned irq, struct ir
 		mask <<= 16;
 
 	/* temporarily mask (level sensitive) parent IRQ */
-	desc->chip->mask(irq);
-	desc->chip->ack(irq);
+	desc->chip->mask(irq, desc);
+	desc->chip->ack(irq, desc);
 	while (1) {
 		u32		status;
 		int		n;
@@ -247,7 +247,7 @@ gpio_irq_handler(unsigned irq, struct ir
 			status >>= res;
 		}
 	}
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 	/* now it may re-trigger */
 }
 
arch/arm/mach-davinci/irq.c +3 -3
Index: linux-2.6/arch/arm/mach-davinci/irq.c
===================================================================
@@ -53,7 +53,7 @@ static inline void davinci_irq_writel(un
 }
 
 /* Disable interrupt */
-static void davinci_mask_irq(unsigned int irq)
+static void davinci_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 	u32 l;
@@ -72,7 +72,7 @@ static void davinci_mask_irq(unsigned in
 }
 
 /* Enable interrupt */
-static void davinci_unmask_irq(unsigned int irq)
+static void davinci_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 	u32 l;
@@ -91,7 +91,7 @@ static void davinci_unmask_irq(unsigned
 }
 
 /* EOI interrupt */
-static void davinci_ack_irq(unsigned int irq)
+static void davinci_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 
arch/arm/mach-dove/irq.c +3 -3
Index: linux-2.6/arch/arm/mach-dove/irq.c
===================================================================
@@ -36,7 +36,7 @@ static void gpio_irq_handler(unsigned in
 	}
 }
 
-static void pmu_irq_mask(unsigned int irq)
+static void pmu_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	int pin = irq_to_pmu(irq);
 	u32 u;
@@ -46,7 +46,7 @@ static void pmu_irq_mask(unsigned int ir
 	writel(u, PMU_INTERRUPT_MASK);
 }
 
-static void pmu_irq_unmask(unsigned int irq)
+static void pmu_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	int pin = irq_to_pmu(irq);
 	u32 u;
@@ -56,7 +56,7 @@ static void pmu_irq_unmask(unsigned int
 	writel(u, PMU_INTERRUPT_MASK);
 }
 
-static void pmu_irq_ack(unsigned int irq)
+static void pmu_irq_ack(unsigned int irq, struct irq_desc *desc)
 {
 	int pin = irq_to_pmu(irq);
 	u32 u;
arch/arm/mach-ebsa110/core.c +2 -2
Index: linux-2.6/arch/arm/mach-ebsa110/core.c
===================================================================
@@ -35,12 +35,12 @@
 #define IRQ_STAT		0xff000000	/* read */
 #define IRQ_MCLR		0xff000000	/* write */
 
-static void ebsa110_mask_irq(unsigned int irq)
+static void ebsa110_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writeb(1 << irq, IRQ_MCLR);
 }
 
-static void ebsa110_unmask_irq(unsigned int irq)
+static void ebsa110_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writeb(1 << irq, IRQ_MSET);
 }
arch/arm/mach-ep93xx/core.c +4 -4
Index: linux-2.6/arch/arm/mach-ep93xx/core.c
===================================================================
@@ -225,7 +225,7 @@ static void ep93xx_gpio_f_irq_handler(un
 	generic_handle_irq(gpio_irq);
 }
 
-static void ep93xx_gpio_irq_ack(unsigned int irq)
+static void ep93xx_gpio_irq_ack(unsigned int irq, struct irq_desc *desc)
 {
 	int line = irq_to_gpio(irq);
 	int port = line >> 3;
@@ -239,7 +239,7 @@ static void ep93xx_gpio_irq_ack(unsigned
 	__raw_writeb(port_mask, EP93XX_GPIO_REG(eoi_register_offset[port]));
 }
 
-static void ep93xx_gpio_irq_mask_ack(unsigned int irq)
+static void ep93xx_gpio_irq_mask_ack(unsigned int irq, struct irq_desc *desc)
 {
 	int line = irq_to_gpio(irq);
 	int port = line >> 3;
@@ -254,7 +254,7 @@ static void ep93xx_gpio_irq_mask_ack(uns
 	__raw_writeb(port_mask, EP93XX_GPIO_REG(eoi_register_offset[port]));
 }
 
-static void ep93xx_gpio_irq_mask(unsigned int irq)
+static void ep93xx_gpio_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	int line = irq_to_gpio(irq);
 	int port = line >> 3;
@@ -263,7 +263,7 @@ static void ep93xx_gpio_irq_mask(unsigne
 	ep93xx_gpio_update_int_params(port);
 }
 
-static void ep93xx_gpio_irq_unmask(unsigned int irq)
+static void ep93xx_gpio_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	int line = irq_to_gpio(irq);
 	int port = line >> 3;
arch/arm/mach-footbridge/common.c +2 -2
Index: linux-2.6/arch/arm/mach-footbridge/common.c
===================================================================
@@ -74,12 +74,12 @@ static const int fb_irq_mask[] = {
 	IRQ_MASK_PCI_PERR,	/* 19 */
 };
 
-static void fb_mask_irq(unsigned int irq)
+static void fb_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	*CSR_IRQ_DISABLE = fb_irq_mask[_DC21285_INR(irq)];
 }
 
-static void fb_unmask_irq(unsigned int irq)
+static void fb_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	*CSR_IRQ_ENABLE = fb_irq_mask[_DC21285_INR(irq)];
 }
arch/arm/mach-footbridge/isa-irq.c +6 -6
Index: linux-2.6/arch/arm/mach-footbridge/isa-irq.c
===================================================================
@@ -30,14 +30,14 @@
 
 #include "common.h"
 
-static void isa_mask_pic_lo_irq(unsigned int irq)
+static void isa_mask_pic_lo_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = 1 << (irq & 7);
 
 	outb(inb(PIC_MASK_LO) | mask, PIC_MASK_LO);
 }
 
-static void isa_ack_pic_lo_irq(unsigned int irq)
+static void isa_ack_pic_lo_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = 1 << (irq & 7);
 
@@ -45,7 +45,7 @@ static void isa_ack_pic_lo_irq(unsigned
 	outb(0x20, PIC_LO);
 }
 
-static void isa_unmask_pic_lo_irq(unsigned int irq)
+static void isa_unmask_pic_lo_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = 1 << (irq & 7);
 
@@ -58,14 +58,14 @@ static struct irq_chip isa_lo_chip = {
 	.unmask = isa_unmask_pic_lo_irq,
 };
 
-static void isa_mask_pic_hi_irq(unsigned int irq)
+static void isa_mask_pic_hi_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = 1 << (irq & 7);
 
 	outb(inb(PIC_MASK_HI) | mask, PIC_MASK_HI);
 }
 
-static void isa_ack_pic_hi_irq(unsigned int irq)
+static void isa_ack_pic_hi_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = 1 << (irq & 7);
 
@@ -74,7 +74,7 @@ static void isa_ack_pic_hi_irq(unsigned
 	outb(0x20, PIC_HI);
 }
 
-static void isa_unmask_pic_hi_irq(unsigned int irq)
+static void isa_unmask_pic_hi_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = 1 << (irq & 7);
 
arch/arm/mach-gemini/gpio.c +3 -3
Index: linux-2.6/arch/arm/mach-gemini/gpio.c
===================================================================
@@ -54,7 +54,7 @@ static void _set_gpio_irqenable(unsigned
 	__raw_writel(reg, base + GPIO_INT_EN);
 }
 
-static void gpio_ack_irq(unsigned int irq)
+static void gpio_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = irq_to_gpio(irq);
 	unsigned int base = GPIO_BASE(gpio / 32);
@@ -62,7 +62,7 @@ static void gpio_ack_irq(unsigned int ir
 	__raw_writel(1 << (gpio % 32), base + GPIO_INT_CLR);
 }
 
-static void gpio_mask_irq(unsigned int irq)
+static void gpio_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = irq_to_gpio(irq);
 	unsigned int base = GPIO_BASE(gpio / 32);
@@ -70,7 +70,7 @@ static void gpio_mask_irq(unsigned int i
 	_set_gpio_irqenable(base, gpio % 32, 0);
 }
 
-static void gpio_unmask_irq(unsigned int irq)
+static void gpio_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = irq_to_gpio(irq);
 	unsigned int base = GPIO_BASE(gpio / 32);
arch/arm/mach-gemini/irq.c +3 -3
Index: linux-2.6/arch/arm/mach-gemini/irq.c
===================================================================
@@ -32,12 +32,12 @@
 #define FIQ_LEVEL(base_addr)	(base_addr + 0x30)
 #define FIQ_STATUS(base_addr)	(base_addr + 0x34)
 
-static void gemini_ack_irq(unsigned int irq)
+static void gemini_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(1 << irq, IRQ_CLEAR(IO_ADDRESS(GEMINI_INTERRUPT_BASE)));
 }
 
-static void gemini_mask_irq(unsigned int irq)
+static void gemini_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 
@@ -46,7 +46,7 @@ static void gemini_mask_irq(unsigned int
 	__raw_writel(mask, IRQ_MASK(IO_ADDRESS(GEMINI_INTERRUPT_BASE)));
 }
 
-static void gemini_unmask_irq(unsigned int irq)
+static void gemini_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 
arch/arm/mach-h720x/common.c +5 -5
Index: linux-2.6/arch/arm/mach-h720x/common.c
===================================================================
@@ -53,7 +53,7 @@ unsigned long h720x_gettimeoffset(void)
 /*
  * mask Global irq's
  */
-static void mask_global_irq (unsigned int irq )
+static void mask_global_irq(unsigned int irq, struct irq_desc *desc)
 {
 	CPU_REG (IRQC_VIRT, IRQC_IER) &= ~(1 << irq);
 }
@@ -61,7 +61,7 @@ static void mask_global_irq (unsigned in
 /*
  * unmask Global irq's
  */
-static void unmask_global_irq (unsigned int irq )
+static void unmask_global_irq(unsigned int irq, struct irq_desc *desc)
 {
 	CPU_REG (IRQC_VIRT, IRQC_IER) |= (1 << irq);
 }
@@ -71,7 +71,7 @@ static void unmask_global_irq (unsigned
  * ack GPIO irq's
  * Ack only for edge triggered int's valid
  */
-static void inline ack_gpio_irq(u32 irq)
+static inline void ack_gpio_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 reg_base = GPIO_VIRT(IRQ_TO_REGNO(irq));
 	u32 bit = IRQ_TO_BIT(irq);
@@ -82,7 +82,7 @@ static void inline ack_gpio_irq(u32 irq)
 /*
  * mask GPIO irq's
  */
-static void inline mask_gpio_irq(u32 irq)
+static inline void mask_gpio_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 reg_base = GPIO_VIRT(IRQ_TO_REGNO(irq));
 	u32 bit = IRQ_TO_BIT(irq);
@@ -92,7 +92,7 @@ static void inline mask_gpio_irq(u32 irq
 /*
  * unmask GPIO irq's
  */
-static void inline unmask_gpio_irq(u32 irq)
+static inline void unmask_gpio_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 reg_base = GPIO_VIRT(IRQ_TO_REGNO(irq));
 	u32 bit = IRQ_TO_BIT(irq);
arch/arm/mach-h720x/cpu-h7202.c +2 -2
Index: linux-2.6/arch/arm/mach-h720x/cpu-h7202.c
===================================================================
@@ -141,7 +141,7 @@ h7202_timer_interrupt(int irq, void *dev
 /*
  * mask multiplexed timer IRQs
  */
-static void inline mask_timerx_irq (u32 irq)
+static inline void mask_timerx_irq(u32 irq, struct irq_desc *desc)
 {
 	unsigned int bit;
 	bit = 2 << ((irq == IRQ_TIMER64B) ? 4 : (irq - IRQ_TIMER1));
@@ -151,7 +151,7 @@ static void inline mask_timerx_irq (u32
 /*
  * unmask multiplexed timer IRQs
  */
-static void inline unmask_timerx_irq (u32 irq)
+static inline void unmask_timerx_irq(u32 irq, struct irq_desc *desc)
 {
 	unsigned int bit;
 	bit = 2 << ((irq == IRQ_TIMER64B) ? 4 : (irq - IRQ_TIMER1));
arch/arm/mach-integrator/integrator_ap.c +2 -2
Index: linux-2.6/arch/arm/mach-integrator/integrator_ap.c
===================================================================
@@ -151,12 +151,12 @@ static void __init ap_map_io(void)
 
 #define INTEGRATOR_SC_VALID_INT	0x003fffff
 
-static void sc_mask_irq(unsigned int irq)
+static void sc_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void sc_unmask_irq(unsigned int irq)
+static void sc_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
 }
arch/arm/mach-integrator/integrator_cp.c +6 -6
Index: linux-2.6/arch/arm/mach-integrator/integrator_cp.c
===================================================================
@@ -145,13 +145,13 @@ static void __init intcp_map_io(void)
 #define sic_writel	__raw_writel
 #define sic_readl	__raw_readl
 
-static void cic_mask_irq(unsigned int irq)
+static void cic_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_CIC_START;
 	cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void cic_unmask_irq(unsigned int irq)
+static void cic_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_CIC_START;
 	cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);
@@ -164,13 +164,13 @@ static struct irq_chip cic_chip = {
 	.unmask	= cic_unmask_irq,
 };
 
-static void pic_mask_irq(unsigned int irq)
+static void pic_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_PIC_START;
 	pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void pic_unmask_irq(unsigned int irq)
+static void pic_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_PIC_START;
 	pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);
@@ -183,13 +183,13 @@ static struct irq_chip pic_chip = {
 	.unmask = pic_unmask_irq,
 };
 
-static void sic_mask_irq(unsigned int irq)
+static void sic_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_SIC_START;
 	sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void sic_unmask_irq(unsigned int irq)
+static void sic_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_SIC_START;
 	sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);
arch/arm/mach-iop13xx/irq.c +8 -8
Index: linux-2.6/arch/arm/mach-iop13xx/irq.c
===================================================================
@@ -123,49 +123,49 @@ static void write_intsize(u32 val)
 
 /* 0 = Interrupt Masked and 1 = Interrupt not masked */
 static void
-iop13xx_irq_mask0 (unsigned int irq)
+iop13xx_irq_mask0(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_0(read_intctl_0() & ~(1 << (irq - 0)));
 }
 
 static void
-iop13xx_irq_mask1 (unsigned int irq)
+iop13xx_irq_mask1(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_1(read_intctl_1() & ~(1 << (irq - 32)));
 }
 
 static void
-iop13xx_irq_mask2 (unsigned int irq)
+iop13xx_irq_mask2(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_2(read_intctl_2() & ~(1 << (irq - 64)));
 }
 
 static void
-iop13xx_irq_mask3 (unsigned int irq)
+iop13xx_irq_mask3(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_3(read_intctl_3() & ~(1 << (irq - 96)));
 }
 
 static void
-iop13xx_irq_unmask0(unsigned int irq)
+iop13xx_irq_unmask0(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_0(read_intctl_0() | (1 << (irq - 0)));
 }
 
 static void
-iop13xx_irq_unmask1(unsigned int irq)
+iop13xx_irq_unmask1(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_1(read_intctl_1() | (1 << (irq - 32)));
 }
 
 static void
-iop13xx_irq_unmask2(unsigned int irq)
+iop13xx_irq_unmask2(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_2(read_intctl_2() | (1 << (irq - 64)));
 }
 
 static void
-iop13xx_irq_unmask3(unsigned int irq)
+iop13xx_irq_unmask3(unsigned int irq, struct irq_desc *desc)
 {
 	write_intctl_3(read_intctl_3() | (1 << (irq - 96)));
 }
arch/arm/mach-iop13xx/msi.c +1 -1
Index: linux-2.6/arch/arm/mach-iop13xx/msi.c
===================================================================
@@ -156,7 +156,7 @@ void arch_teardown_msi_irq(unsigned int
 	destroy_irq(irq);
 }
 
-static void iop13xx_msi_nop(unsigned int irq)
+static void iop13xx_msi_nop(unsigned int irq, struct irq_desc *desc)
 {
 	return;
 }
arch/arm/mach-iop32x/irq.c +2 -2
Index: linux-2.6/arch/arm/mach-iop32x/irq.c
===================================================================
@@ -32,14 +32,14 @@ static void intstr_write(u32 val)
 }
 
 static void
-iop32x_irq_mask(unsigned int irq)
+iop32x_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	iop32x_mask &= ~(1 << irq);
 	intctl_write(iop32x_mask);
 }
 
 static void
-iop32x_irq_unmask(unsigned int irq)
+iop32x_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	iop32x_mask |= 1 << irq;
 	intctl_write(iop32x_mask);
arch/arm/mach-ixp2000/core.c +9 -9
Index: linux-2.6/arch/arm/mach-ixp2000/core.c
===================================================================
@@ -342,7 +342,7 @@ static int ixp2000_GPIO_irq_type(unsigne
 	return 0;
 }
 
-static void ixp2000_GPIO_irq_mask_ack(unsigned int irq)
+static void ixp2000_GPIO_irq_mask_ack(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_write(IXP2000_GPIO_INCR, (1 << (irq - IRQ_IXP2000_GPIO0)));
 
@@ -351,12 +351,12 @@ static void ixp2000_GPIO_irq_mask_ack(un
 	ixp2000_reg_wrb(IXP2000_GPIO_INST, (1 << (irq - IRQ_IXP2000_GPIO0)));
 }
 
-static void ixp2000_GPIO_irq_mask(unsigned int irq)
+static void ixp2000_GPIO_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_wrb(IXP2000_GPIO_INCR, (1 << (irq - IRQ_IXP2000_GPIO0)));
 }
 
-static void ixp2000_GPIO_irq_unmask(unsigned int irq)
+static void ixp2000_GPIO_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_write(IXP2000_GPIO_INSR, (1 << (irq - IRQ_IXP2000_GPIO0)));
 }
@@ -368,7 +368,7 @@ static struct irq_chip ixp2000_GPIO_irq_
 	.set_type	= ixp2000_GPIO_irq_type,
 };
 
-static void ixp2000_pci_irq_mask(unsigned int irq)
+static void ixp2000_pci_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned long temp = *IXP2000_PCI_XSCALE_INT_ENABLE;
 	if (irq == IRQ_IXP2000_PCIA)
@@ -377,7 +377,7 @@ static void ixp2000_pci_irq_mask(unsigne
 		ixp2000_reg_wrb(IXP2000_PCI_XSCALE_INT_ENABLE, (temp & ~(1 << 27)));
 }
 
-static void ixp2000_pci_irq_unmask(unsigned int irq)
+static void ixp2000_pci_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned long temp = *IXP2000_PCI_XSCALE_INT_ENABLE;
 	if (irq == IRQ_IXP2000_PCIA)
@@ -401,13 +401,13 @@ static void ixp2000_err_irq_handler(unsi
 	}
 }
 
-static void ixp2000_err_irq_mask(unsigned int irq)
+static void ixp2000_err_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_write(IXP2000_IRQ_ERR_ENABLE_CLR,
 			(1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR)));
 }
 
-static void ixp2000_err_irq_unmask(unsigned int irq)
+static void ixp2000_err_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_write(IXP2000_IRQ_ERR_ENABLE_SET,
 			(1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR)));
@@ -425,12 +425,12 @@ static struct irq_chip ixp2000_pci_irq_c
 	.unmask	= ixp2000_pci_irq_unmask
 };
 
-static void ixp2000_irq_mask(unsigned int irq)
+static void ixp2000_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_wrb(IXP2000_IRQ_ENABLE_CLR, (1 << irq));
 }
 
-static void ixp2000_irq_unmask(unsigned int irq)
+static void ixp2000_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << irq));
 }
arch/arm/mach-ixp2000/ixdp2x00.c +4 -4
Index: linux-2.6/arch/arm/mach-ixp2000/ixdp2x00.c
===================================================================
@@ -64,7 +64,7 @@ static struct slowport_cfg slowport_cpld
 };
 #endif
 
-static void ixdp2x00_irq_mask(unsigned int irq)
+static void ixdp2x00_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned long dummy;
 	static struct slowport_cfg old_cfg;
@@ -88,7 +88,7 @@ static void ixdp2x00_irq_mask(unsigned i
 #endif
 }
 
-static void ixdp2x00_irq_unmask(unsigned int irq)
+static void ixdp2x00_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned long dummy;
 	static struct slowport_cfg old_cfg;
@@ -112,7 +112,7 @@ static void ixdp2x00_irq_handler(unsigne
 	static struct slowport_cfg old_cfg;
 	int i;
 
-	desc->chip->mask(irq);
+	desc->chip->mask(irq, desc);
 
 #ifdef CONFIG_ARCH_IXDP2400
 	if (machine_is_ixdp2400())
@@ -134,7 +134,7 @@ static void ixdp2x00_irq_handler(unsigne
 		}
 	}
 
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 static struct irq_chip ixdp2x00_cpld_irq_chip = {
arch/arm/mach-ixp2000/ixdp2x01.c +4 -4
Index: linux-2.6/arch/arm/mach-ixp2000/ixdp2x01.c
===================================================================
@@ -49,13 +49,13 @@
 /*************************************************************************
  * IXDP2x01 IRQ Handling
  *************************************************************************/
-static void ixdp2x01_irq_mask(unsigned int irq)
+static void ixdp2x01_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_wrb(IXDP2X01_INT_MASK_SET_REG,
 				IXP2000_BOARD_IRQ_MASK(irq));
 }
 
-static void ixdp2x01_irq_unmask(unsigned int irq)
+static void ixdp2x01_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	ixp2000_reg_write(IXDP2X01_INT_MASK_CLR_REG,
 				IXP2000_BOARD_IRQ_MASK(irq));
@@ -68,7 +68,7 @@ static void ixdp2x01_irq_handler(unsigne
 	u32 ex_interrupt;
 	int i;
 
-	desc->chip->mask(irq);
+	desc->chip->mask(irq, desc);
 
 	ex_interrupt = *IXDP2X01_INT_STAT_REG & valid_irq_mask;
 
@@ -84,7 +84,7 @@ static void ixdp2x01_irq_handler(unsigne
 		}
 	}
 
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 static struct irq_chip ixdp2x01_irq_chip = {
arch/arm/mach-ixp23xx/core.c +8 -8
Index: linux-2.6/arch/arm/mach-ixp23xx/core.c
===================================================================
@@ -173,7 +173,7 @@ static int ixp23xx_irq_set_type(unsigned
 	return 0;
 }
 
-static void ixp23xx_irq_mask(unsigned int irq)
+static void ixp23xx_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	volatile unsigned long *intr_reg;
 
@@ -184,7 +184,7 @@ static void ixp23xx_irq_mask(unsigned in
 	*intr_reg &= ~(1 << (irq % 32));
 }
 
-static void ixp23xx_irq_ack(unsigned int irq)
+static void ixp23xx_irq_ack(unsigned int irq, struct irq_desc *desc)
 {
 	int line = irq - IRQ_IXP23XX_GPIO6 + 6;
 
@@ -198,7 +198,7 @@ static void ixp23xx_irq_ack(unsigned int
  * Level triggered interrupts on GPIO lines can only be cleared when the
  * interrupt condition disappears.
  */
-static void ixp23xx_irq_level_unmask(unsigned int irq)
+static void ixp23xx_irq_level_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	volatile unsigned long *intr_reg;
 
@@ -211,7 +211,7 @@ static void ixp23xx_irq_level_unmask(uns
 	*intr_reg |= (1 << (irq % 32));
 }
 
-static void ixp23xx_irq_edge_unmask(unsigned int irq)
+static void ixp23xx_irq_edge_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	volatile unsigned long *intr_reg;
 
@@ -236,12 +236,12 @@ static struct irq_chip ixp23xx_irq_edge_
 	.set_type	= ixp23xx_irq_set_type
 };
 
-static void ixp23xx_pci_irq_mask(unsigned int irq)
+static void ixp23xx_pci_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	*IXP23XX_PCI_XSCALE_INT_ENABLE &= ~(1 << (IRQ_IXP23XX_INTA + 27 - irq));
 }
 
-static void ixp23xx_pci_irq_unmask(unsigned int irq)
+static void ixp23xx_pci_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	*IXP23XX_PCI_XSCALE_INT_ENABLE |= (1 << (IRQ_IXP23XX_INTA + 27 - irq));
 }
@@ -256,7 +256,7 @@ static void pci_handler(unsigned int irq
 
 	pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS;
 
-	desc->chip->ack(irq);
+	desc->chip->ack(irq, desc);
 
 	/* See which PCI_INTA, or PCI_INTB interrupted */
 	if (pci_interrupt & (1 << 26)) {
@@ -269,7 +269,7 @@ static void pci_handler(unsigned int irq
 
 	generic_handle_irq(irqno);
 
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 static struct irq_chip ixp23xx_pci_irq_chip = {
arch/arm/mach-ixp23xx/ixdp2351.c +8 -8
Index: linux-2.6/arch/arm/mach-ixp23xx/ixdp2351.c
===================================================================
@@ -48,12 +48,12 @@
 /*
  * IXDP2351 Interrupt Handling
  */
-static void ixdp2351_inta_mask(unsigned int irq)
+static void ixdp2351_inta_mask(unsigned int irq, struct irq_desc *desc)
 {
 	*IXDP2351_CPLD_INTA_MASK_SET_REG = IXDP2351_INTA_IRQ_MASK(irq);
 }
 
-static void ixdp2351_inta_unmask(unsigned int irq)
+static void ixdp2351_inta_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	*IXDP2351_CPLD_INTA_MASK_CLR_REG = IXDP2351_INTA_IRQ_MASK(irq);
 }
@@ -64,7 +64,7 @@ static void ixdp2351_inta_handler(unsign
 		*IXDP2351_CPLD_INTA_STAT_REG & IXDP2351_INTA_IRQ_VALID;
 	int i;
 
-	desc->chip->mask(irq);
+	desc->chip->mask(irq, desc);
 
 	for (i = 0; i < IXDP2351_INTA_IRQ_NUM; i++) {
 		if (ex_interrupt & (1 << i)) {
@@ -74,7 +74,7 @@ static void ixdp2351_inta_handler(unsign
 		}
 	}
 
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 static struct irq_chip ixdp2351_inta_chip = {
@@ -83,12 +83,12 @@ static struct irq_chip ixdp2351_inta_chi
 	.unmask	= ixdp2351_inta_unmask
 };
 
-static void ixdp2351_intb_mask(unsigned int irq)
+static void ixdp2351_intb_mask(unsigned int irq, struct irq_desc *desc)
 {
 	*IXDP2351_CPLD_INTB_MASK_SET_REG = IXDP2351_INTB_IRQ_MASK(irq);
 }
 
-static void ixdp2351_intb_unmask(unsigned int irq)
+static void ixdp2351_intb_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	*IXDP2351_CPLD_INTB_MASK_CLR_REG = IXDP2351_INTB_IRQ_MASK(irq);
 }
@@ -99,7 +99,7 @@ static void ixdp2351_intb_handler(unsign
 		*IXDP2351_CPLD_INTB_STAT_REG & IXDP2351_INTB_IRQ_VALID;
 	int i;
 
-	desc->chip->ack(irq);
+	desc->chip->ack(irq, desc);
 
 	for (i = 0; i < IXDP2351_INTB_IRQ_NUM; i++) {
 		if (ex_interrupt & (1 << i)) {
@@ -109,7 +109,7 @@ static void ixdp2351_intb_handler(unsign
 		}
 	}
 
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 static struct irq_chip ixdp2351_intb_chip = {
arch/arm/mach-ixp4xx/common.c +3 -3
Index: linux-2.6/arch/arm/mach-ixp4xx/common.c
===================================================================
@@ -193,7 +193,7 @@ static int ixp4xx_set_irq_type(unsigned
 	return 0;
 }
 
-static void ixp4xx_irq_mask(unsigned int irq)
+static void ixp4xx_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	if ((cpu_is_ixp46x() || cpu_is_ixp43x()) && irq >= 32)
 		*IXP4XX_ICMR2 &= ~(1 << (irq - 32));
@@ -201,7 +201,7 @@ static void ixp4xx_irq_mask(unsigned int
 		*IXP4XX_ICMR &= ~(1 << irq);
 }
 
-static void ixp4xx_irq_ack(unsigned int irq)
+static void ixp4xx_irq_ack(unsigned int irq, struct irq_desc *desc)
 {
 	int line = (irq < 32) ? irq2gpio[irq] : -1;
 
@@ -213,7 +213,7 @@ static void ixp4xx_irq_ack(unsigned int
  * Level triggered interrupts on GPIO lines can only be cleared when the
  * interrupt condition disappears.
  */
-static void ixp4xx_irq_unmask(unsigned int irq)
+static void ixp4xx_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	if (!(ixp4xx_irq_edge & (1 << irq)))
 		ixp4xx_irq_ack(irq);
arch/arm/mach-ks8695/irq.c +3 -3
Index: linux-2.6/arch/arm/mach-ks8695/irq.c
===================================================================
@@ -34,7 +34,7 @@
 #include <mach/regs-irq.h>
 #include <mach/regs-gpio.h>
 
-static void ks8695_irq_mask(unsigned int irqno)
+static void ks8695_irq_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long inten;
 
@@ -44,7 +44,7 @@ static void ks8695_irq_mask(unsigned int
 	__raw_writel(inten, KS8695_IRQ_VA + KS8695_INTEN);
 }
 
-static void ks8695_irq_unmask(unsigned int irqno)
+static void ks8695_irq_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long inten;
 
@@ -54,7 +54,7 @@ static void ks8695_irq_unmask(unsigned i
 	__raw_writel(inten, KS8695_IRQ_VA + KS8695_INTEN);
 }
 
-static void ks8695_irq_ack(unsigned int irqno)
+static void ks8695_irq_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	__raw_writel((1 << irqno), KS8695_IRQ_VA + KS8695_INTST);
 }
arch/arm/mach-l7200/core.c +2 -2
Index: linux-2.6/arch/arm/mach-l7200/core.c
===================================================================
@@ -45,12 +45,12 @@
 #define FIQ_SOFT	(*(volatile unsigned long *) (IRQ_BASE + 0x110))
 #define FIQ_SOURCESEL	(*(volatile unsigned long *) (IRQ_BASE + 0x118))
 
-static void l7200_mask_irq(unsigned int irq)
+static void l7200_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	IRQ_ENABLECLEAR = 1 << irq;
 }
 
-static void l7200_unmask_irq(unsigned int irq)
+static void l7200_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	IRQ_ENABLE = 1 << irq;
 }
arch/arm/mach-lh7a40x/arch-kev7a400.c +3 -3
Index: linux-2.6/arch/arm/mach-lh7a40x/arch-kev7a400.c
===================================================================
@@ -46,18 +46,18 @@ void __init kev7a400_map_io(void)
 
 static u16 CPLD_IRQ_mask;	/* Mask for CPLD IRQs, 1 == unmasked */
 
-static void kev7a400_ack_cpld_irq (u32 irq)
+static void kev7a400_ack_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	CPLD_CL_INT = 1 << (irq - IRQ_KEV7A400_CPLD);
 }
 
-static void kev7a400_mask_cpld_irq (u32 irq)
+static void kev7a400_mask_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	CPLD_IRQ_mask &= ~(1 << (irq - IRQ_KEV7A400_CPLD));
 	CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask;
 }
 
-static void kev7a400_unmask_cpld_irq (u32 irq)
+static void kev7a400_unmask_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	CPLD_IRQ_mask |= 1 << (irq - IRQ_KEV7A400_CPLD);
 	CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask;
arch/arm/mach-lh7a40x/arch-lpd7a40x.c +5 -5
Index: linux-2.6/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
===================================================================
@@ -159,7 +159,7 @@ static void __init lpd7a40x_init (void)
 #endif
 }
 
-static void lh7a40x_ack_cpld_irq (u32 irq)
+static void lh7a40x_ack_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	/* CPLD doesn't have ack capability, but some devices may */
 
@@ -172,7 +172,7 @@ static void lh7a40x_ack_cpld_irq (u32 ir
 #endif
 }
 
-static void lh7a40x_mask_cpld_irq (u32 irq)
+static void lh7a40x_mask_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	switch (irq) {
 	case IRQ_LPD7A40X_ETH_INT:
@@ -186,7 +186,7 @@ static void lh7a40x_mask_cpld_irq (u32 i
 	}
 }
 
-static void lh7a40x_unmask_cpld_irq (u32 irq)
+static void lh7a40x_unmask_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	switch (irq) {
 	case IRQ_LPD7A40X_ETH_INT:
@@ -211,7 +211,7 @@ static void lpd7a40x_cpld_handler (unsig
 {
 	unsigned int mask = CPLD_INTERRUPTS;
 
-	desc->chip->ack (irq);
+	desc->chip->ack(irq, desc);
 
 	if ((mask & (1<<0)) == 0)	/* WLAN */
 		generic_handle_irq(IRQ_LPD7A40X_ETH_INT);
@@ -221,7 +221,7 @@ static void lpd7a40x_cpld_handler (unsig
 		generic_handle_irq(IRQ_TOUCH);
 #endif
 
-	desc->chip->unmask (irq); /* Level-triggered need this */
+	desc->chip->unmask(irq, desc); /* Level-triggered need this */
 }
 
 
arch/arm/mach-lh7a40x/irq-lh7a400.c +3 -3
Index: linux-2.6/arch/arm/mach-lh7a40x/irq-lh7a400.c
===================================================================
@@ -21,17 +21,17 @@
 
   /* CPU IRQ handling */
 
-static void lh7a400_mask_irq (u32 irq)
+static void lh7a400_mask_irq(u32 irq, struct irq_desc *desc)
 {
 	INTC_INTENC = (1 << irq);
 }
 
-static void lh7a400_unmask_irq (u32 irq)
+static void lh7a400_unmask_irq(u32 irq, struct irq_desc *desc)
 {
 	INTC_INTENS = (1 << irq);
 }
 
-static void lh7a400_ack_gpio_irq (u32 irq)
+static void lh7a400_ack_gpio_irq(u32 irq, struct irq_desc *desc)
 {
 	GPIO_GPIOFEOI = (1 << IRQ_TO_GPIO (irq));
 	INTC_INTENC = (1 << irq);
arch/arm/mach-lh7a40x/irq-lh7a404.c +6 -6
Index: linux-2.6/arch/arm/mach-lh7a40x/irq-lh7a404.c
===================================================================
@@ -43,33 +43,33 @@ static unsigned char irq_pri_vic2[] = {
 
   /* CPU IRQ handling */
 
-static void lh7a404_vic1_mask_irq (u32 irq)
+static void lh7a404_vic1_mask_irq(u32 irq, struct irq_desc *desc)
 {
 	VIC1_INTENCLR = (1 << irq);
 }
 
-static void lh7a404_vic1_unmask_irq (u32 irq)
+static void lh7a404_vic1_unmask_irq(u32 irq, struct irq_desc *desc)
 {
 	VIC1_INTEN = (1 << irq);
 }
 
-static void lh7a404_vic2_mask_irq (u32 irq)
+static void lh7a404_vic2_mask_irq(u32 irq, struct irq_desc *desc)
 {
 	VIC2_INTENCLR = (1 << (irq - 32));
 }
 
-static void lh7a404_vic2_unmask_irq (u32 irq)
+static void lh7a404_vic2_unmask_irq(u32 irq, struct irq_desc *desc)
 {
 	VIC2_INTEN = (1 << (irq - 32));
 }
 
-static void lh7a404_vic1_ack_gpio_irq (u32 irq)
+static void lh7a404_vic1_ack_gpio_irq(u32 irq, struct irq_desc *desc)
 {
 	GPIO_GPIOFEOI = (1 << IRQ_TO_GPIO (irq));
 	VIC1_INTENCLR = (1 << irq);
 }
 
-static void lh7a404_vic2_ack_gpio_irq (u32 irq)
+static void lh7a404_vic2_ack_gpio_irq(u32 irq, struct irq_desc *desc)
 {
 	GPIO_GPIOFEOI = (1 << IRQ_TO_GPIO (irq));
 	VIC2_INTENCLR = (1 << irq);
arch/arm/mach-lh7a40x/irq-lpd7a40x.c +5 -5
Index: linux-2.6/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
===================================================================
@@ -20,12 +20,12 @@
 
 #include "common.h"
 
-static void lh7a40x_ack_cpld_irq (u32 irq)
+static void lh7a40x_ack_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	/* CPLD doesn't have ack capability */
 }
 
-static void lh7a40x_mask_cpld_irq (u32 irq)
+static void lh7a40x_mask_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	switch (irq) {
 	case IRQ_LPD7A40X_ETH_INT:
@@ -37,7 +37,7 @@ static void lh7a40x_mask_cpld_irq (u32 i
 	}
 }
 
-static void lh7a40x_unmask_cpld_irq (u32 irq)
+static void lh7a40x_unmask_cpld_irq(u32 irq, struct irq_desc *desc)
 {
 	switch (irq) {
 	case IRQ_LPD7A40X_ETH_INT:
@@ -60,7 +60,7 @@ static void lh7a40x_cpld_handler (unsign
 {
 	unsigned int mask = CPLD_INTERRUPTS;
 
-	desc->chip->ack (irq);
+	desc->chip->ack(irq, desc);
 
 	if ((mask & 0x1) == 0)	/* WLAN */
 		generic_handle_irq(IRQ_LPD7A40X_ETH_INT);
@@ -68,7 +68,7 @@ static void lh7a40x_cpld_handler (unsign
 	if ((mask & 0x2) == 0)	/* Touch */
 		generic_handle_irq(IRQ_LPD7A400_TS);
 
-	desc->chip->unmask (irq); /* Level-triggered need this */
+	desc->chip->unmask(irq, desc); /* Level-triggered need this */
 }
 
 
arch/arm/mach-mmp/irq.c +2 -2
Index: linux-2.6/arch/arm/mach-mmp/irq.c
===================================================================
@@ -25,12 +25,12 @@
 #define PRIORITY_DEFAULT	0x1
 #define PRIORITY_NONE		0x0	/* means IRQ disabled */
 
-static void icu_mask_irq(unsigned int irq)
+static void icu_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(PRIORITY_NONE, ICU_INT_CONF(irq));
 }
 
-static void icu_unmask_irq(unsigned int irq)
+static void icu_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(IRQ_ROUTE_TO_AP | PRIORITY_DEFAULT, ICU_INT_CONF(irq));
 }
arch/arm/mach-mx3/mx31ads.c +3 -3
Index: linux-2.6/arch/arm/mach-mx3/mx31ads.c
===================================================================
@@ -142,7 +142,7 @@ static void mx31ads_expio_irq_handler(u3
  * Disable an expio pin's interrupt by setting the bit in the imr.
  * @param irq           an expio virtual irq number
  */
-static void expio_mask_irq(u32 irq)
+static void expio_mask_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 expio = MXC_IRQ_TO_EXPIO(irq);
 	/* mask the interrupt */
@@ -154,7 +154,7 @@ static void expio_mask_irq(u32 irq)
  * Acknowledge an expanded io pin's interrupt by clearing the bit in the isr.
  * @param irq           an expanded io virtual irq number
  */
-static void expio_ack_irq(u32 irq)
+static void expio_ack_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 expio = MXC_IRQ_TO_EXPIO(irq);
 	/* clear the interrupt status */
@@ -165,7 +165,7 @@ static void expio_ack_irq(u32 irq)
  * Enable a expio pin's interrupt by clearing the bit in the imr.
  * @param irq           a expio virtual irq number
  */
-static void expio_unmask_irq(u32 irq)
+static void expio_unmask_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 expio = MXC_IRQ_TO_EXPIO(irq);
 	/* unmask the interrupt */
arch/arm/mach-mx3/mx31pdk.c +3 -3
Index: linux-2.6/arch/arm/mach-mx3/mx31pdk.c
===================================================================
@@ -116,7 +116,7 @@ static void mx31pdk_expio_irq_handler(ui
  * Disable an expio pin's interrupt by setting the bit in the imr.
  * @param irq           an expio virtual irq number
  */
-static void expio_mask_irq(uint32_t irq)
+static void expio_mask_irq(uint32_t irq, struct irq_desc *desc)
 {
 	uint16_t reg;
 	uint32_t expio = MXC_IRQ_TO_EXPIO(irq);
@@ -131,7 +131,7 @@ static void expio_mask_irq(uint32_t irq)
  * Acknowledge an expanded io pin's interrupt by clearing the bit in the isr.
  * @param irq           an expanded io virtual irq number
  */
-static void expio_ack_irq(uint32_t irq)
+static void expio_ack_irq(uint32_t irq, struct irq_desc *desc)
 {
 	uint32_t expio = MXC_IRQ_TO_EXPIO(irq);
 
@@ -146,7 +146,7 @@ static void expio_ack_irq(uint32_t irq)
  * Enable a expio pin's interrupt by clearing the bit in the imr.
  * @param irq           a expio virtual irq number
  */
-static void expio_unmask_irq(uint32_t irq)
+static void expio_unmask_irq(uint32_t irq, struct irq_desc *desc)
 {
 	uint16_t reg;
 	uint32_t expio = MXC_IRQ_TO_EXPIO(irq);
arch/arm/mach-netx/generic.c +3 -3
Index: linux-2.6/arch/arm/mach-netx/generic.c
===================================================================
@@ -119,7 +119,7 @@ netx_hif_irq_type(unsigned int _irq, uns
 }
 
 static void
-netx_hif_ack_irq(unsigned int _irq)
+netx_hif_ack_irq(unsigned int _irq, struct irq_desc *desc)
 {
 	unsigned int val, irq;
 
@@ -134,7 +134,7 @@ netx_hif_ack_irq(unsigned int _irq)
 }
 
 static void
-netx_hif_mask_irq(unsigned int _irq)
+netx_hif_mask_irq(unsigned int _irq, struct irq_desc *desc)
 {
 	unsigned int val, irq;
 
@@ -146,7 +146,7 @@ netx_hif_mask_irq(unsigned int _irq)
 }
 
 static void
-netx_hif_unmask_irq(unsigned int _irq)
+netx_hif_unmask_irq(unsigned int _irq, struct irq_desc *desc)
 {
 	unsigned int val, irq;
 
arch/arm/mach-nomadik/gpio.c +3 -3
Index: linux-2.6/arch/arm/mach-nomadik/gpio.c
===================================================================
@@ -95,7 +95,7 @@ static inline int nmk_gpio_get_bitmask(i
 	return 1 << (gpio % 32);
 }
 
-static void nmk_gpio_irq_ack(unsigned int irq)
+static void nmk_gpio_irq_ack(unsigned int irq, struct irq_desc *desc)
 {
 	int gpio;
 	struct nmk_gpio_chip *nmk_chip;
@@ -107,7 +107,7 @@ static void nmk_gpio_irq_ack(unsigned in
 	writel(nmk_gpio_get_bitmask(gpio), nmk_chip->addr + NMK_GPIO_IC);
 }
 
-static void nmk_gpio_irq_mask(unsigned int irq)
+static void nmk_gpio_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	int gpio;
 	struct nmk_gpio_chip *nmk_chip;
@@ -135,7 +135,7 @@ static void nmk_gpio_irq_mask(unsigned i
 	spin_unlock_irqrestore(&nmk_chip->lock, flags);
 };
 
-static void nmk_gpio_irq_unmask(unsigned int irq)
+static void nmk_gpio_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	int gpio;
 	struct nmk_gpio_chip *nmk_chip;
arch/arm/mach-ns9xxx/board-a9m9750dev.c +6 -6
Index: linux-2.6/arch/arm/mach-ns9xxx/board-a9m9750dev.c
===================================================================
@@ -37,12 +37,12 @@ void __init board_a9m9750dev_map_io(void
 		     ARRAY_SIZE(board_a9m9750dev_io_desc));
 }
 
-static void a9m9750dev_fpga_ack_irq(unsigned int irq)
+static void a9m9750dev_fpga_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* nothing */
 }
 
-static void a9m9750dev_fpga_mask_irq(unsigned int irq)
+static void a9m9750dev_fpga_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	u8 ier;
 
@@ -53,13 +53,13 @@ static void a9m9750dev_fpga_mask_irq(uns
 	__raw_writeb(ier, FPGA_IER);
 }
 
-static void a9m9750dev_fpga_maskack_irq(unsigned int irq)
+static void a9m9750dev_fpga_maskack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	a9m9750dev_fpga_mask_irq(irq);
 	a9m9750dev_fpga_ack_irq(irq);
 }
 
-static void a9m9750dev_fpga_unmask_irq(unsigned int irq)
+static void a9m9750dev_fpga_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	u8 ier;
 
@@ -82,7 +82,7 @@ static void a9m9750dev_fpga_demux_handle
 {
 	u8 stat = __raw_readb(FPGA_ISR);
 
-	desc->chip->mask_ack(irq);
+	desc->chip->mask_ack(irq, desc);
 
 	while (stat != 0) {
 		int irqno = fls(stat) - 1;
@@ -92,7 +92,7 @@ static void a9m9750dev_fpga_demux_handle
 		generic_handle_irq(FPGA_IRQ(irqno));
 	}
 
-	desc->chip->unmask(irq);
+	desc->chip->unmask(irq, desc);
 }
 
 void __init board_a9m9750dev_init_irq(void)
arch/arm/mach-ns9xxx/irq.c +6 -6
Index: linux-2.6/arch/arm/mach-ns9xxx/irq.c
===================================================================
@@ -22,7 +22,7 @@
 #define irq2prio(i) (i)
 #define prio2irq(p) (p)
 
-static void ns9xxx_mask_irq(unsigned int irq)
+static void ns9xxx_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* XXX: better use cpp symbols */
 	int prio = irq2prio(irq);
@@ -31,18 +31,18 @@ static void ns9xxx_mask_irq(unsigned int
 	__raw_writel(ic, SYS_IC(prio / 4));
 }
 
-static void ns9xxx_ack_irq(unsigned int irq)
+static void ns9xxx_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(0, SYS_ISRADDR);
 }
 
-static void ns9xxx_maskack_irq(unsigned int irq)
+static void ns9xxx_maskack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	ns9xxx_mask_irq(irq);
 	ns9xxx_ack_irq(irq);
 }
 
-static void ns9xxx_unmask_irq(unsigned int irq)
+static void ns9xxx_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* XXX: better use cpp symbols */
 	int prio = irq2prio(irq);
@@ -92,10 +92,10 @@ static void handle_prio_irq(unsigned int
 
 	if (desc->status & IRQ_DISABLED)
 out_mask:
-		desc->chip->mask(irq);
+		desc->chip->mask(irq, desc);
 
 	/* ack unconditionally to unmask lower prio irqs */
-	desc->chip->ack(irq);
+	desc->chip->ack(irq, desc);
 
 	raw_spin_unlock(&desc->lock);
 }
arch/arm/mach-omap1/fpga.c +4 -4
Index: linux-2.6/arch/arm/mach-omap1/fpga.c
===================================================================
@@ -30,7 +30,7 @@
 #include <plat/fpga.h>
 #include <mach/gpio.h>
 
-static void fpga_mask_irq(unsigned int irq)
+static void fpga_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= OMAP_FPGA_IRQ_BASE;
 
@@ -58,12 +58,12 @@ static inline u32 get_fpga_unmasked_irqs
 }
 
 
-static void fpga_ack_irq(unsigned int irq)
+static void fpga_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* Don't need to explicitly ACK FPGA interrupts */
 }
 
-static void fpga_unmask_irq(unsigned int irq)
+static void fpga_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= OMAP_FPGA_IRQ_BASE;
 
@@ -78,7 +78,7 @@ static void fpga_unmask_irq(unsigned int
 			      | (1 << (irq - 16))), INNOVATOR_FPGA_IMR2);
 }
 
-static void fpga_mask_ack_irq(unsigned int irq)
+static void fpga_mask_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	fpga_mask_irq(irq);
 	fpga_ack_irq(irq);
arch/arm/mach-omap1/irq.c +6 -6
Index: linux-2.6/arch/arm/mach-omap1/irq.c
===================================================================
@@ -70,7 +70,7 @@ static inline void irq_bank_writel(unsig
 	omap_writel(value, irq_banks[bank].base_reg + offset);
 }
 
-static void omap_ack_irq(unsigned int irq)
+static void omap_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	if (irq > 31)
 		omap_writel(0x1, OMAP_IH2_BASE + IRQ_CONTROL_REG_OFFSET);
@@ -78,7 +78,7 @@ static void omap_ack_irq(unsigned int ir
 	omap_writel(0x1, OMAP_IH1_BASE + IRQ_CONTROL_REG_OFFSET);
 }
 
-static void omap_mask_irq(unsigned int irq)
+static void omap_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int bank = IRQ_BANK(irq);
 	u32 l;
@@ -88,7 +88,7 @@ static void omap_mask_irq(unsigned int i
 	omap_writel(l, irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
 }
 
-static void omap_unmask_irq(unsigned int irq)
+static void omap_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int bank = IRQ_BANK(irq);
 	u32 l;
@@ -98,10 +98,10 @@ static void omap_unmask_irq(unsigned int
 	omap_writel(l, irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
 }
 
-static void omap_mask_ack_irq(unsigned int irq)
+static void omap_mask_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
-	omap_mask_irq(irq);
-	omap_ack_irq(irq);
+	omap_mask_irq(irq, desc);
+	omap_ack_irq(irq, desc);
 }
 
 static int omap_wake_irq(unsigned int irq, unsigned int enable)
arch/arm/mach-pnx4008/irq.c +3 -3
Index: linux-2.6/arch/arm/mach-pnx4008/irq.c
===================================================================
@@ -36,17 +36,17 @@
 
 static u8 pnx4008_irq_type[NR_IRQS] = PNX4008_IRQ_TYPES;
 
-static void pnx4008_mask_irq(unsigned int irq)
+static void pnx4008_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(__raw_readl(INTC_ER(irq)) & ~INTC_BIT(irq), INTC_ER(irq));	/* mask interrupt */
 }
 
-static void pnx4008_unmask_irq(unsigned int irq)
+static void pnx4008_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(__raw_readl(INTC_ER(irq)) | INTC_BIT(irq), INTC_ER(irq));	/* unmask interrupt */
 }
 
-static void pnx4008_mask_ack_irq(unsigned int irq)
+static void pnx4008_mask_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(__raw_readl(INTC_ER(irq)) & ~INTC_BIT(irq), INTC_ER(irq));	/* mask interrupt */
 	__raw_writel(INTC_BIT(irq), INTC_SR(irq));	/* clear interrupt status */
arch/arm/mach-pxa/balloon3.c +3 -3
Index: linux-2.6/arch/arm/mach-pxa/balloon3.c
===================================================================
@@ -73,14 +73,14 @@ int __init parse_balloon3_features(char
 }
 early_param("balloon3_features", parse_balloon3_features);
 
-static void balloon3_mask_irq(unsigned int irq)
+static void balloon3_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int balloon3_irq = (irq - BALLOON3_IRQ(0));
 	balloon3_irq_enabled &= ~(1 << balloon3_irq);
 	__raw_writel(~balloon3_irq_enabled, BALLOON3_INT_CONTROL_REG);
 }
 
-static void balloon3_unmask_irq(unsigned int irq)
+static void balloon3_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int balloon3_irq = (irq - BALLOON3_IRQ(0));
 	balloon3_irq_enabled |= (1 << balloon3_irq);
@@ -102,7 +102,7 @@ static void balloon3_irq_handler(unsigne
 	do {
 		/* clear useless edge notification */
 		if (desc->chip->ack)
-			desc->chip->ack(BALLOON3_AUX_NIRQ);
+			desc->chip->ack(BALLOON3_AUX_NIRQ, irq_to_desc(BALLOON3_AUX_NIRQ));
 		while (pending) {
 			irq = BALLOON3_IRQ(0) + __ffs(pending);
 			generic_handle_irq(irq);
arch/arm/mach-pxa/irq.c +5 -5
Index: linux-2.6/arch/arm/mach-pxa/irq.c
===================================================================
@@ -37,12 +37,12 @@
 
 static int pxa_internal_irq_nr;
 
-static void pxa_mask_irq(unsigned int irq)
+static void pxa_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	_ICMR(irq) &= ~(1 << IRQ_BIT(irq));
 }
 
-static void pxa_unmask_irq(unsigned int irq)
+static void pxa_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	_ICMR(irq) |= 1 << IRQ_BIT(irq);
 }
@@ -79,17 +79,17 @@ static int pxa_set_low_gpio_type(unsigne
 	return 0;
 }
 
-static void pxa_ack_low_gpio(unsigned int irq)
+static void pxa_ack_low_gpio(unsigned int irq, struct irq_desc *desc)
 {
 	GEDR0 = (1 << (irq - IRQ_GPIO0));
 }
 
-static void pxa_mask_low_gpio(unsigned int irq)
+static void pxa_mask_low_gpio(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR &= ~(1 << (irq - PXA_IRQ(0)));
 }
 
-static void pxa_unmask_low_gpio(unsigned int irq)
+static void pxa_unmask_low_gpio(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR |= 1 << (irq - PXA_IRQ(0));
 }
arch/arm/mach-pxa/lpd270.c +2 -2
Index: linux-2.6/arch/arm/mach-pxa/lpd270.c
===================================================================
@@ -90,7 +90,7 @@ static unsigned long lpd270_pin_config[]
 
 static unsigned int lpd270_irq_enabled;
 
-static void lpd270_mask_irq(unsigned int irq)
+static void lpd270_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int lpd270_irq = irq - LPD270_IRQ(0);
 
@@ -100,7 +100,7 @@ static void lpd270_mask_irq(unsigned int
 	__raw_writew(lpd270_irq_enabled, LPD270_INT_MASK);
 }
 
-static void lpd270_unmask_irq(unsigned int irq)
+static void lpd270_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int lpd270_irq = irq - LPD270_IRQ(0);
 
arch/arm/mach-pxa/lubbock.c +2 -2
Index: linux-2.6/arch/arm/mach-pxa/lubbock.c
===================================================================
@@ -133,13 +133,13 @@ EXPORT_SYMBOL(lubbock_set_misc_wr);
 
 static unsigned long lubbock_irq_enabled;
 
-static void lubbock_mask_irq(unsigned int irq)
+static void lubbock_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int lubbock_irq = (irq - LUBBOCK_IRQ(0));
 	LUB_IRQ_MASK_EN = (lubbock_irq_enabled &= ~(1 << lubbock_irq));
 }
 
-static void lubbock_unmask_irq(unsigned int irq)
+static void lubbock_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int lubbock_irq = (irq - LUBBOCK_IRQ(0));
 	/* the irq can be acknowledged only if deasserted, so it's done here */
arch/arm/mach-pxa/mainstone.c +2 -2
Index: linux-2.6/arch/arm/mach-pxa/mainstone.c
===================================================================
@@ -137,13 +137,13 @@ static unsigned long mainstone_pin_confi
 
 static unsigned long mainstone_irq_enabled;
 
-static void mainstone_mask_irq(unsigned int irq)
+static void mainstone_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int mainstone_irq = (irq - MAINSTONE_IRQ(0));
 	MST_INTMSKENA = (mainstone_irq_enabled &= ~(1 << mainstone_irq));
 }
 
-static void mainstone_unmask_irq(unsigned int irq)
+static void mainstone_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int mainstone_irq = (irq - MAINSTONE_IRQ(0));
 	/* the irq can be acknowledged only if deasserted, so it's done here */
arch/arm/mach-pxa/pcm990-baseboard.c +2 -2
Index: linux-2.6/arch/arm/mach-pxa/pcm990-baseboard.c
===================================================================
@@ -235,13 +235,13 @@ static struct platform_device pcm990_bac
 
 static unsigned long pcm990_irq_enabled;
 
-static void pcm990_mask_ack_irq(unsigned int irq)
+static void pcm990_mask_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int pcm990_irq = (irq - PCM027_IRQ(0));
 	PCM990_INTMSKENA = (pcm990_irq_enabled &= ~(1 << pcm990_irq));
 }
 
-static void pcm990_unmask_irq(unsigned int irq)
+static void pcm990_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int pcm990_irq = (irq - PCM027_IRQ(0));
 	/* the irq can be acknowledged only if deasserted, so it's done here */
arch/arm/mach-pxa/pxa3xx.c +3 -3
Index: linux-2.6/arch/arm/mach-pxa/pxa3xx.c
===================================================================
@@ -536,18 +536,18 @@ static inline void pxa3xx_init_pm(void)
 #define pxa3xx_set_wake	NULL
 #endif
 
-static void pxa_ack_ext_wakeup(unsigned int irq)
+static void pxa_ack_ext_wakeup(unsigned int irq, struct irq_desc *desc)
 {
 	PECR |= PECR_IS(irq - IRQ_WAKEUP0);
 }
 
-static void pxa_mask_ext_wakeup(unsigned int irq)
+static void pxa_mask_ext_wakeup(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR2 &= ~(1 << ((irq - PXA_IRQ(0)) & 0x1f));
 	PECR &= ~PECR_IE(irq - IRQ_WAKEUP0);
 }
 
-static void pxa_unmask_ext_wakeup(unsigned int irq)
+static void pxa_unmask_ext_wakeup(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR2 |= 1 << ((irq - PXA_IRQ(0)) & 0x1f);
 	PECR |= PECR_IE(irq - IRQ_WAKEUP0);
arch/arm/mach-pxa/viper.c +3 -3
Index: linux-2.6/arch/arm/mach-pxa/viper.c
===================================================================
@@ -247,7 +247,7 @@ static inline int viper_bit_to_irq(int b
 	return viper_isa_irqs[bit] + PXA_ISA_IRQ(0);
 }
 
-static void viper_ack_irq(unsigned int irq)
+static void viper_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	int viper_irq = viper_irq_to_bitmask(irq);
 
@@ -257,12 +257,12 @@ static void viper_ack_irq(unsigned int i
 		VIPER_HI_IRQ_STATUS = (viper_irq >> 8);
 }
 
-static void viper_mask_irq(unsigned int irq)
+static void viper_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	viper_irq_enabled_mask &= ~(viper_irq_to_bitmask(irq));
 }
 
-static void viper_unmask_irq(unsigned int irq)
+static void viper_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	viper_irq_enabled_mask |= viper_irq_to_bitmask(irq);
 }
arch/arm/mach-pxa/zeus.c +4 -4
Index: linux-2.6/arch/arm/mach-pxa/zeus.c
===================================================================
@@ -81,17 +81,17 @@ static inline int zeus_bit_to_irq(int bi
 	return zeus_isa_irqs[bit] + PXA_ISA_IRQ(0);
 }
 
-static void zeus_ack_irq(unsigned int irq)
+static void zeus_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writew(zeus_irq_to_bitmask(irq), ZEUS_CPLD_ISA_IRQ);
 }
 
-static void zeus_mask_irq(unsigned int irq)
+static void zeus_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	zeus_irq_enabled_mask &= ~(zeus_irq_to_bitmask(irq));
 }
 
-static void zeus_unmask_irq(unsigned int irq)
+static void zeus_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	zeus_irq_enabled_mask |= zeus_irq_to_bitmask(irq);
 }
@@ -109,7 +109,7 @@ static void zeus_irq_handler(unsigned in
 	do {
 		/* we're in a chained irq handler,
 		 * so ack the interrupt by hand */
-		desc->chip->ack(gpio_to_irq(ZEUS_ISA_GPIO));
+		desc->chip->ack(gpio_to_irq(ZEUS_ISA_GPIO), irq_to_desc(gipo_to_irq(ZEUS_ISA_GPIO));
 
 		if (likely(pending)) {
 			irq = zeus_bit_to_irq(__ffs(pending));
arch/arm/mach-rpc/irq.c +9 -9
Index: linux-2.6/arch/arm/mach-rpc/irq.c
===================================================================
@@ -6,7 +6,7 @@
 #include <asm/hardware/iomd.h>
 #include <asm/irq.h>
 
-static void iomd_ack_irq_a(unsigned int irq)
+static void iomd_ack_irq_a(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -16,7 +16,7 @@ static void iomd_ack_irq_a(unsigned int
 	iomd_writeb(mask, IOMD_IRQCLRA);
 }
 
-static void iomd_mask_irq_a(unsigned int irq)
+static void iomd_mask_irq_a(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -25,7 +25,7 @@ static void iomd_mask_irq_a(unsigned int
 	iomd_writeb(val & ~mask, IOMD_IRQMASKA);
 }
 
-static void iomd_unmask_irq_a(unsigned int irq)
+static void iomd_unmask_irq_a(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -40,7 +40,7 @@ static struct irq_chip iomd_a_chip = {
 	.unmask = iomd_unmask_irq_a,
 };
 
-static void iomd_mask_irq_b(unsigned int irq)
+static void iomd_mask_irq_b(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -49,7 +49,7 @@ static void iomd_mask_irq_b(unsigned int
 	iomd_writeb(val & ~mask, IOMD_IRQMASKB);
 }
 
-static void iomd_unmask_irq_b(unsigned int irq)
+static void iomd_unmask_irq_b(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -64,7 +64,7 @@ static struct irq_chip iomd_b_chip = {
 	.unmask = iomd_unmask_irq_b,
 };
 
-static void iomd_mask_irq_dma(unsigned int irq)
+static void iomd_mask_irq_dma(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -73,7 +73,7 @@ static void iomd_mask_irq_dma(unsigned i
 	iomd_writeb(val & ~mask, IOMD_DMAMASK);
 }
 
-static void iomd_unmask_irq_dma(unsigned int irq)
+static void iomd_unmask_irq_dma(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -88,7 +88,7 @@ static struct irq_chip iomd_dma_chip = {
 	.unmask = iomd_unmask_irq_dma,
 };
 
-static void iomd_mask_irq_fiq(unsigned int irq)
+static void iomd_mask_irq_fiq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
@@ -97,7 +97,7 @@ static void iomd_mask_irq_fiq(unsigned i
 	iomd_writeb(val & ~mask, IOMD_FIQMASK);
 }
 
-static void iomd_unmask_irq_fiq(unsigned int irq)
+static void iomd_unmask_irq_fiq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int val, mask;
 
arch/arm/mach-s3c2410/bast-irq.c +5 -7
Index: linux-2.6/arch/arm/mach-s3c2410/bast-irq.c
===================================================================
@@ -75,7 +75,7 @@ static unsigned char bast_pc104_irqmasks
 static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };
 
 static void
-bast_pc104_mask(unsigned int irqno)
+bast_pc104_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long temp;
 
@@ -85,16 +85,14 @@ bast_pc104_mask(unsigned int irqno)
 }
 
 static void
-bast_pc104_maskack(unsigned int irqno)
+bast_pc104_maskack(unsigned int irqno, struct irq_desc *desc)
 {
-	struct irq_desc *desc = irq_desc + IRQ_ISA;
-
 	bast_pc104_mask(irqno);
-	desc->chip->ack(IRQ_ISA);
+	desc->chip->ack(IRQ_ISA, desc);
 }
 
 static void
-bast_pc104_unmask(unsigned int irqno)
+bast_pc104_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long temp;
 
@@ -123,7 +121,7 @@ bast_irq_pc104_demux(unsigned int irq,
 		/* ack if we get an irq with nothing (ie, startup) */
 
 		desc = irq_desc + IRQ_ISA;
-		desc->chip->ack(IRQ_ISA);
+		desc->chip->ack(IRQ_ISA, desc);
 	} else {
 		/* handle the IRQ */
 
arch/arm/mach-s3c2412/irq.c +7 -7
Index: linux-2.6/arch/arm/mach-s3c2412/irq.c
===================================================================
@@ -49,7 +49,7 @@
 */
 
 static void
-s3c2412_irq_mask(unsigned int irqno)
+s3c2412_irq_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
 	unsigned long mask;
@@ -62,7 +62,7 @@ s3c2412_irq_mask(unsigned int irqno)
 }
 
 static inline void
-s3c2412_irq_ack(unsigned int irqno)
+s3c2412_irq_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
 
@@ -72,7 +72,7 @@ s3c2412_irq_ack(unsigned int irqno)
 }
 
 static inline void
-s3c2412_irq_maskack(unsigned int irqno)
+s3c2412_irq_maskack(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
 	unsigned long mask;
@@ -89,7 +89,7 @@ s3c2412_irq_maskack(unsigned int irqno)
 }
 
 static void
-s3c2412_irq_unmask(unsigned int irqno)
+s3c2412_irq_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
 	unsigned long mask;
@@ -132,17 +132,17 @@ static void s3c2412_irq_demux_cfsdi(unsi
 #define INTMSK_CFSDI	(1UL << (IRQ_S3C2412_CFSDI - IRQ_EINT0))
 #define SUBMSK_CFSDI	INTMSK_SUB(IRQ_S3C2412_SDI, IRQ_S3C2412_CF)
 
-static void s3c2412_irq_cfsdi_mask(unsigned int irqno)
+static void s3c2412_irq_cfsdi_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_CFSDI, SUBMSK_CFSDI);
 }
 
-static void s3c2412_irq_cfsdi_unmask(unsigned int irqno)
+static void s3c2412_irq_cfsdi_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_CFSDI);
 }
 
-static void s3c2412_irq_cfsdi_ack(unsigned int irqno)
+static void s3c2412_irq_cfsdi_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_CFSDI, SUBMSK_CFSDI);
 }
arch/arm/mach-s3c2440/irq.c +3 -3
Index: linux-2.6/arch/arm/mach-s3c2440/irq.c
===================================================================
@@ -69,19 +69,19 @@ static void s3c_irq_demux_wdtac97(unsign
 #define INTMSK_WDT	 (1UL << (IRQ_WDT - IRQ_EINT0))
 
 static void
-s3c_irq_wdtac97_mask(unsigned int irqno)
+s3c_irq_wdtac97_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_WDT, 3<<13);
 }
 
 static void
-s3c_irq_wdtac97_unmask(unsigned int irqno)
+s3c_irq_wdtac97_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_WDT);
 }
 
 static void
-s3c_irq_wdtac97_ack(unsigned int irqno)
+s3c_irq_wdtac97_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_WDT, 3<<13);
 }
arch/arm/mach-s3c2443/irq.c +15 -15
Index: linux-2.6/arch/arm/mach-s3c2443/irq.c
===================================================================
@@ -75,17 +75,17 @@ static void s3c2443_irq_demux_wdtac97(un
 #define INTMSK_WDTAC97	(1UL << (IRQ_WDT - IRQ_EINT0))
 #define SUBMSK_WDTAC97	INTMSK(IRQ_S3C2443_WDT, IRQ_S3C2443_AC97)
 
-static void s3c2443_irq_wdtac97_mask(unsigned int irqno)
+static void s3c2443_irq_wdtac97_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97);
 }
 
-static void s3c2443_irq_wdtac97_unmask(unsigned int irqno)
+static void s3c2443_irq_wdtac97_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_WDTAC97);
 }
 
-static void s3c2443_irq_wdtac97_ack(unsigned int irqno)
+static void s3c2443_irq_wdtac97_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97);
 }
@@ -107,17 +107,17 @@ static void s3c2443_irq_demux_lcd(unsign
 #define INTMSK_LCD	(1UL << (IRQ_LCD - IRQ_EINT0))
 #define SUBMSK_LCD	INTMSK(IRQ_S3C2443_LCD1, IRQ_S3C2443_LCD4)
 
-static void s3c2443_irq_lcd_mask(unsigned int irqno)
+static void s3c2443_irq_lcd_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_LCD, SUBMSK_LCD);
 }
 
-static void s3c2443_irq_lcd_unmask(unsigned int irqno)
+static void s3c2443_irq_lcd_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_LCD);
 }
 
-static void s3c2443_irq_lcd_ack(unsigned int irqno)
+static void s3c2443_irq_lcd_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_LCD, SUBMSK_LCD);
 }
@@ -140,17 +140,17 @@ static void s3c2443_irq_demux_dma(unsign
 #define SUBMSK_DMA	INTMSK(IRQ_S3C2443_DMA0, IRQ_S3C2443_DMA5)
 
 
-static void s3c2443_irq_dma_mask(unsigned int irqno)
+static void s3c2443_irq_dma_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_DMA, SUBMSK_DMA);
 }
 
-static void s3c2443_irq_dma_unmask(unsigned int irqno)
+static void s3c2443_irq_dma_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_DMA);
 }
 
-static void s3c2443_irq_dma_ack(unsigned int irqno)
+static void s3c2443_irq_dma_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_DMA, SUBMSK_DMA);
 }
@@ -173,17 +173,17 @@ static void s3c2443_irq_demux_uart3(unsi
 #define SUBMSK_UART3	(0xf << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))
 
 
-static void s3c2443_irq_uart3_mask(unsigned int irqno)
+static void s3c2443_irq_uart3_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_UART3, SUBMSK_UART3);
 }
 
-static void s3c2443_irq_uart3_unmask(unsigned int irqno)
+static void s3c2443_irq_uart3_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_UART3);
 }
 
-static void s3c2443_irq_uart3_ack(unsigned int irqno)
+static void s3c2443_irq_uart3_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_UART3, SUBMSK_UART3);
 }
@@ -205,17 +205,17 @@ static void s3c2443_irq_demux_cam(unsign
 #define INTMSK_CAM	(1UL << (IRQ_CAM - IRQ_EINT0))
 #define SUBMSK_CAM	INTMSK(IRQ_S3C2440_CAM_C, IRQ_S3C2440_CAM_P)
 
-static void s3c2443_irq_cam_mask(unsigned int irqno)
+static void s3c2443_irq_cam_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_CAM, SUBMSK_CAM);
 }
 
-static void s3c2443_irq_cam_unmask(unsigned int irqno)
+static void s3c2443_irq_cam_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_CAM);
 }
 
-static void s3c2443_irq_cam_ack(unsigned int irqno)
+static void s3c2443_irq_cam_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_CAM, SUBMSK_CAM);
 }
arch/arm/mach-sa1100/irq.c +8 -8
Index: linux-2.6/arch/arm/mach-sa1100/irq.c
===================================================================
@@ -70,17 +70,17 @@ static int sa1100_gpio_type(unsigned int
 /*
  * GPIO IRQs must be acknowledged.  This is for IRQs from 0 to 10.
  */
-static void sa1100_low_gpio_ack(unsigned int irq)
+static void sa1100_low_gpio_ack(unsigned int irq, struct irq_desc *desc)
 {
 	GEDR = (1 << irq);
 }
 
-static void sa1100_low_gpio_mask(unsigned int irq)
+static void sa1100_low_gpio_mask(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR &= ~(1 << irq);
 }
 
-static void sa1100_low_gpio_unmask(unsigned int irq)
+static void sa1100_low_gpio_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR |= 1 << irq;
 }
@@ -139,14 +139,14 @@ sa1100_high_gpio_handler(unsigned int ir
  * In addition, the IRQs are all collected up into one bit in the
  * interrupt controller registers.
  */
-static void sa1100_high_gpio_ack(unsigned int irq)
+static void sa1100_high_gpio_ack(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = GPIO11_27_MASK(irq);
 
 	GEDR = mask;
 }
 
-static void sa1100_high_gpio_mask(unsigned int irq)
+static void sa1100_high_gpio_mask(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = GPIO11_27_MASK(irq);
 
@@ -156,7 +156,7 @@ static void sa1100_high_gpio_mask(unsign
 	GFER &= ~mask;
 }
 
-static void sa1100_high_gpio_unmask(unsigned int irq)
+static void sa1100_high_gpio_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask = GPIO11_27_MASK(irq);
 
@@ -188,12 +188,12 @@ static struct irq_chip sa1100_high_gpio_
  * We don't need to ACK IRQs on the SA1100 unless they're GPIOs
  * this is for internal IRQs i.e. from 11 to 31.
  */
-static void sa1100_mask_irq(unsigned int irq)
+static void sa1100_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR &= ~(1 << irq);
 }
 
-static void sa1100_unmask_irq(unsigned int irq)
+static void sa1100_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	ICMR |= (1 << irq);
 }
arch/arm/mach-sa1100/neponset.c +4 -4
Index: linux-2.6/arch/arm/mach-sa1100/neponset.c
===================================================================
@@ -36,7 +36,7 @@ neponset_irq_handler(unsigned int irq, s
 		/*
 		 * Acknowledge the parent IRQ.
 		 */
-		desc->chip->ack(irq);
+		desc->chip->ack(irq, desc);
 
 		/*
 		 * Read the interrupt reason register.  Let's have all
@@ -54,7 +54,7 @@ neponset_irq_handler(unsigned int irq, s
 		 * recheck the register for any pending IRQs.
 		 */
 		if (irr & (IRR_ETHERNET | IRR_USAR)) {
-			desc->chip->mask(irq);
+			desc->chip->mask(irq, desc);
 
 			/*
 			 * Ack the interrupt now to prevent re-entering
@@ -62,7 +62,7 @@ neponset_irq_handler(unsigned int irq, s
 			 * since we'll check the IRR register prior to
 			 * leaving.
 			 */
-			desc->chip->ack(irq);
+			desc->chip->ack(irq, desc);
 
 			if (irr & IRR_ETHERNET) {
 				generic_handle_irq(IRQ_NEPONSET_SMC9196);
@@ -72,7 +72,7 @@ neponset_irq_handler(unsigned int irq, s
 				generic_handle_irq(IRQ_NEPONSET_USAR);
 			}
 
-			desc->chip->unmask(irq);
+			desc->chip->unmask(irq, desc);
 		}
 
 		if (irr & IRR_SA1111) {
arch/arm/mach-shark/irq.c +5 -3
Index: linux-2.6/arch/arm/mach-shark/irq.c
===================================================================
@@ -30,7 +30,7 @@ static unsigned char cached_irq_mask[2]
  * These have to be protected by the irq controller spinlock
  * before being called.
  */
-static void shark_disable_8259A_irq(unsigned int irq)
+static void shark_disable_8259A_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 	if (irq<8) {
@@ -44,7 +44,7 @@ static void shark_disable_8259A_irq(unsi
 	}
 }
 
-static void shark_enable_8259A_irq(unsigned int irq)
+static void shark_enable_8259A_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 	if (irq<8) {
@@ -58,7 +58,9 @@ static void shark_enable_8259A_irq(unsig
 	}
 }
 
-static void shark_ack_8259A_irq(unsigned int irq){}
+static void shark_ack_8259A_irq(unsigned int irq, struct irq_desc *desc)
+{
+}
 
 static irqreturn_t bogus_int(int irq, void *dev_id)
 {
arch/arm/mach-stmp378x/stmp378x.c +3 -3
Index: linux-2.6/arch/arm/mach-stmp378x/stmp378x.c
===================================================================
@@ -47,7 +47,7 @@
 /*
  * IRQ handling
  */
-static void stmp378x_ack_irq(unsigned int irq)
+static void stmp378x_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* Tell ICOLL to release IRQ line */
 	__raw_writel(0, REGS_ICOLL_BASE + HW_ICOLL_VECTOR);
@@ -60,14 +60,14 @@ static void stmp378x_ack_irq(unsigned in
 	(void)__raw_readl(REGS_ICOLL_BASE + HW_ICOLL_STAT);
 }
 
-static void stmp378x_mask_irq(unsigned int irq)
+static void stmp378x_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* IRQ disable */
 	stmp3xxx_clearl(BM_ICOLL_INTERRUPTn_ENABLE,
 			REGS_ICOLL_BASE + HW_ICOLL_INTERRUPTn + irq * 0x10);
 }
 
-static void stmp378x_unmask_irq(unsigned int irq)
+static void stmp378x_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* IRQ enable */
 	stmp3xxx_setl(BM_ICOLL_INTERRUPTn_ENABLE,
arch/arm/mach-stmp37xx/stmp37xx.c +3 -3
Index: linux-2.6/arch/arm/mach-stmp37xx/stmp37xx.c
===================================================================
@@ -43,7 +43,7 @@
 /*
  * IRQ handling
  */
-static void stmp37xx_ack_irq(unsigned int irq)
+static void stmp37xx_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* Disable IRQ */
 	stmp3xxx_clearl(0x04 << ((irq % 4) * 8),
@@ -56,14 +56,14 @@ static void stmp37xx_ack_irq(unsigned in
 	(void)__raw_readl(REGS_ICOLL_BASE + HW_ICOLL_STAT);
 }
 
-static void stmp37xx_mask_irq(unsigned int irq)
+static void stmp37xx_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* IRQ disable */
 	stmp3xxx_clearl(0x04 << ((irq % 4) * 8),
 		REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + irq / 4 * 0x10);
 }
 
-static void stmp37xx_unmask_irq(unsigned int irq)
+static void stmp37xx_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* IRQ enable */
 	stmp3xxx_setl(0x04 << ((irq % 4) * 8),
arch/arm/mach-versatile/core.c +2 -2
Index: linux-2.6/arch/arm/mach-versatile/core.c
===================================================================
@@ -62,13 +62,13 @@
 #define VA_VIC_BASE		__io_address(VERSATILE_VIC_BASE)
 #define VA_SIC_BASE		__io_address(VERSATILE_SIC_BASE)
 
-static void sic_mask_irq(unsigned int irq)
+static void sic_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_SIC_START;
 	writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);
 }
 
-static void sic_unmask_irq(unsigned int irq)
+static void sic_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irq -= IRQ_SIC_START;
 	writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_SET);
arch/arm/mach-w90x900/irq.c +3 -3
Index: linux-2.6/arch/arm/mach-w90x900/irq.c
===================================================================
@@ -92,7 +92,7 @@ static void nuc900_group_enable(struct g
 	__raw_writel(regval, REG_AIC_GEN);
 }
 
-static void nuc900_irq_mask(unsigned int irq)
+static void nuc900_irq_mask(unsigned int irq, struct irq_desc *desc)
 {
 	struct group_irq *group_irq;
 
@@ -143,12 +143,12 @@ static void nuc900_irq_mask(unsigned int
  * to REG_AIC_EOSCR for ACK
  */
 
-static void nuc900_irq_ack(unsigned int irq)
+static void nuc900_irq_ack(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(0x01, REG_AIC_EOSCR);
 }
 
-static void nuc900_irq_unmask(unsigned int irq)
+static void nuc900_irq_unmask(unsigned int irq, struct irq_desc *desc)
 {
 	struct group_irq *group_irq;
 
arch/arm/plat-mxc/gpio.c +3 -3
Index: linux-2.6/arch/arm/plat-mxc/gpio.c
===================================================================
@@ -63,19 +63,19 @@ static void _set_gpio_irqenable(struct m
 	__raw_writel(l, port->base + GPIO_IMR);
 }
 
-static void gpio_ack_irq(u32 irq)
+static void gpio_ack_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 gpio = irq_to_gpio(irq);
 	_clear_gpio_irqstatus(&mxc_gpio_ports[gpio / 32], gpio & 0x1f);
 }
 
-static void gpio_mask_irq(u32 irq)
+static void gpio_mask_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 gpio = irq_to_gpio(irq);
 	_set_gpio_irqenable(&mxc_gpio_ports[gpio / 32], gpio & 0x1f, 0);
 }
 
-static void gpio_unmask_irq(u32 irq)
+static void gpio_unmask_irq(u32 irq, struct irq_desc *desc)
 {
 	u32 gpio = irq_to_gpio(irq);
 	_set_gpio_irqenable(&mxc_gpio_ports[gpio / 32], gpio & 0x1f, 1);
arch/arm/plat-mxc/irq.c +2 -2
Index: linux-2.6/arch/arm/plat-mxc/irq.c
===================================================================
@@ -91,13 +91,13 @@ EXPORT_SYMBOL(mxc_set_irq_fiq);
 #endif /* CONFIG_FIQ */
 
 /* Disable interrupt number "irq" in the AVIC */
-static void mxc_mask_irq(unsigned int irq)
+static void mxc_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(irq, avic_base + AVIC_INTDISNUM);
 }
 
 /* Enable interrupt number "irq" in the AVIC */
-static void mxc_unmask_irq(unsigned int irq)
+static void mxc_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	__raw_writel(irq, avic_base + AVIC_INTENNUM);
 }
arch/arm/plat-omap/gpio.c +9 -9
Index: linux-2.6/arch/arm/plat-omap/gpio.c
===================================================================
@@ -1267,7 +1267,7 @@ static void gpio_irq_handler(unsigned in
 	u32 retrigger = 0;
 	int unmasked = 0;
 
-	desc->chip->ack(irq);
+	desc->chip->ack(irq, desc);
 
 	bank = get_irq_data(irq);
 #ifdef CONFIG_ARCH_OMAP1
@@ -1319,7 +1319,7 @@ static void gpio_irq_handler(unsigned in
 		configured, we could unmask GPIO bank interrupt immediately */
 		if (!level_mask && !unmasked) {
 			unmasked = 1;
-			desc->chip->unmask(irq);
+			desc->chip->unmask(irq, desc);
 		}
 
 		isr |= retrigger;
@@ -1354,7 +1354,7 @@ static void gpio_irq_handler(unsigned in
 	handler(s) are executed in order to avoid spurious bank
 	interrupt */
 	if (!unmasked)
-		desc->chip->unmask(irq);
+		desc->chip->unmask(irq, desc);
 
 }
 
@@ -1366,7 +1366,7 @@ static void gpio_irq_shutdown(unsigned i
 	_reset_gpio(bank, gpio);
 }
 
-static void gpio_ack_irq(unsigned int irq)
+static void gpio_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = irq - IH_GPIO_BASE;
 	struct gpio_bank *bank = get_irq_chip_data(irq);
@@ -1374,7 +1374,7 @@ static void gpio_ack_irq(unsigned int ir
 	_clear_gpio_irqstatus(bank, gpio);
 }
 
-static void gpio_mask_irq(unsigned int irq)
+static void gpio_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = irq - IH_GPIO_BASE;
 	struct gpio_bank *bank = get_irq_chip_data(irq);
@@ -1383,7 +1383,7 @@ static void gpio_mask_irq(unsigned int i
 	_set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE);
 }
 
-static void gpio_unmask_irq(unsigned int irq)
+static void gpio_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = irq - IH_GPIO_BASE;
 	struct gpio_bank *bank = get_irq_chip_data(irq);
@@ -1420,12 +1420,12 @@ static struct irq_chip gpio_irq_chip = {
 
 /* MPUIO uses the always-on 32k clock */
 
-static void mpuio_ack_irq(unsigned int irq)
+static void mpuio_ack_irq(unsigned int irq, struct irq_desc *desc)
 {
 	/* The ISR is reset automatically, so do nothing here. */
 }
 
-static void mpuio_mask_irq(unsigned int irq)
+static void mpuio_mask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = OMAP_MPUIO(irq - IH_MPUIO_BASE);
 	struct gpio_bank *bank = get_irq_chip_data(irq);
@@ -1433,7 +1433,7 @@ static void mpuio_mask_irq(unsigned int
 	_set_gpio_irqenable(bank, gpio, 0);
 }
 
-static void mpuio_unmask_irq(unsigned int irq)
+static void mpuio_unmask_irq(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned int gpio = OMAP_MPUIO(irq - IH_MPUIO_BASE);
 	struct gpio_bank *bank = get_irq_chip_data(irq);
arch/arm/plat-orion/gpio.c +3 -3
Index: linux-2.6/arch/arm/plat-orion/gpio.c
===================================================================
@@ -233,7 +233,7 @@ EXPORT_SYMBOL(orion_gpio_set_blink);
  *
  ****************************************************************************/
 
-static void gpio_irq_ack(u32 irq)
+static void gpio_irq_ack(u32 irq, struct irq_desc *desc)
 {
 	int type = irq_desc[irq].status & IRQ_TYPE_SENSE_MASK;
 	if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
@@ -242,7 +242,7 @@ static void gpio_irq_ack(u32 irq)
 	}
 }
 
-static void gpio_irq_mask(u32 irq)
+static void gpio_irq_mask(u32 irq, struct irq_desc *desc)
 {
 	int pin = irq_to_gpio(irq);
 	int type = irq_desc[irq].status & IRQ_TYPE_SENSE_MASK;
@@ -253,7 +253,7 @@ static void gpio_irq_mask(u32 irq)
 	writel(u, reg);
 }
 
-static void gpio_irq_unmask(u32 irq)
+static void gpio_irq_unmask(u32 irq, struct irq_desc *desc)
 {
 	int pin = irq_to_gpio(irq);
 	int type = irq_desc[irq].status & IRQ_TYPE_SENSE_MASK;
arch/arm/plat-orion/irq.c +2 -2
Index: linux-2.6/arch/arm/plat-orion/irq.c
===================================================================
@@ -14,7 +14,7 @@
 #include <linux/io.h>
 #include <plat/irq.h>
 
-static void orion_irq_mask(u32 irq)
+static void orion_irq_mask(u32 irq, struct irq_desc *desc)
 {
 	void __iomem *maskaddr = get_irq_chip_data(irq);
 	u32 mask;
@@ -24,7 +24,7 @@ static void orion_irq_mask(u32 irq)
 	writel(mask, maskaddr);
 }
 
-static void orion_irq_unmask(u32 irq)
+static void orion_irq_unmask(u32 irq, struct irq_desc *desc)
 {
 	void __iomem *maskaddr = get_irq_chip_data(irq);
 	u32 mask;
arch/arm/plat-pxa/gpio.c +3 -3
Index: linux-2.6/arch/arm/plat-pxa/gpio.c
===================================================================
@@ -227,7 +227,7 @@ static void pxa_gpio_demux_handler(unsig
 	} while (loop);
 }
 
-static void pxa_ack_muxed_gpio(unsigned int irq)
+static void pxa_ack_muxed_gpio(unsigned int irq, struct irq_desc *desc)
 {
 	int gpio = irq_to_gpio(irq);
 	struct pxa_gpio_chip *c = gpio_to_chip(gpio);
@@ -235,7 +235,7 @@ static void pxa_ack_muxed_gpio(unsigned
 	__raw_writel(GPIO_bit(gpio), c->regbase + GEDR_OFFSET);
 }
 
-static void pxa_mask_muxed_gpio(unsigned int irq)
+static void pxa_mask_muxed_gpio(unsigned int irq, struct irq_desc *desc)
 {
 	int gpio = irq_to_gpio(irq);
 	struct pxa_gpio_chip *c = gpio_to_chip(gpio);
@@ -249,7 +249,7 @@ static void pxa_mask_muxed_gpio(unsigned
 	__raw_writel(gfer, c->regbase + GFER_OFFSET);
 }
 
-static void pxa_unmask_muxed_gpio(unsigned int irq)
+static void pxa_unmask_muxed_gpio(unsigned int irq, struct irq_desc *desc)
 {
 	int gpio = irq_to_gpio(irq);
 	struct pxa_gpio_chip *c = gpio_to_chip(gpio);
arch/arm/plat-s3c24xx/irq.c +19 -19
Index: linux-2.6/arch/arm/plat-s3c24xx/irq.c
===================================================================
@@ -34,7 +34,7 @@
 #include <plat/irq.h>
 
 static void
-s3c_irq_mask(unsigned int irqno)
+s3c_irq_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long mask;
 
@@ -46,7 +46,7 @@ s3c_irq_mask(unsigned int irqno)
 }
 
 static inline void
-s3c_irq_ack(unsigned int irqno)
+s3c_irq_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
 
@@ -55,7 +55,7 @@ s3c_irq_ack(unsigned int irqno)
 }
 
 static inline void
-s3c_irq_maskack(unsigned int irqno)
+s3c_irq_maskack(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
 	unsigned long mask;
@@ -69,7 +69,7 @@ s3c_irq_maskack(unsigned int irqno)
 
 
 static void
-s3c_irq_unmask(unsigned int irqno)
+s3c_irq_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long mask;
 
@@ -100,7 +100,7 @@ struct irq_chip s3c_irq_chip = {
 };
 
 static void
-s3c_irqext_mask(unsigned int irqno)
+s3c_irqext_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long mask;
 
@@ -112,7 +112,7 @@ s3c_irqext_mask(unsigned int irqno)
 }
 
 static void
-s3c_irqext_ack(unsigned int irqno)
+s3c_irqext_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long req;
 	unsigned long bit;
@@ -139,7 +139,7 @@ s3c_irqext_ack(unsigned int irqno)
 }
 
 static void
-s3c_irqext_unmask(unsigned int irqno)
+s3c_irqext_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	unsigned long mask;
 
@@ -261,19 +261,19 @@ static struct irq_chip s3c_irq_eint0t4 =
 /* UART0 */
 
 static void
-s3c_irq_uart0_mask(unsigned int irqno)
+s3c_irq_uart0_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_UART0, 7);
 }
 
 static void
-s3c_irq_uart0_unmask(unsigned int irqno)
+s3c_irq_uart0_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_UART0);
 }
 
 static void
-s3c_irq_uart0_ack(unsigned int irqno)
+s3c_irq_uart0_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_UART0, 7);
 }
@@ -288,19 +288,19 @@ static struct irq_chip s3c_irq_uart0 = {
 /* UART1 */
 
 static void
-s3c_irq_uart1_mask(unsigned int irqno)
+s3c_irq_uart1_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_UART1, 7 << 3);
 }
 
 static void
-s3c_irq_uart1_unmask(unsigned int irqno)
+s3c_irq_uart1_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_UART1);
 }
 
 static void
-s3c_irq_uart1_ack(unsigned int irqno)
+s3c_irq_uart1_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_UART1, 7 << 3);
 }
@@ -315,19 +315,19 @@ static struct irq_chip s3c_irq_uart1 = {
 /* UART2 */
 
 static void
-s3c_irq_uart2_mask(unsigned int irqno)
+s3c_irq_uart2_mask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_mask(irqno, INTMSK_UART2, 7 << 6);
 }
 
 static void
-s3c_irq_uart2_unmask(unsigned int irqno)
+s3c_irq_uart2_unmask(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_unmask(irqno, INTMSK_UART2);
 }
 
 static void
-s3c_irq_uart2_ack(unsigned int irqno)
+s3c_irq_uart2_ack(unsigned int irqno, struct irq_desc *desc)
 {
 	s3c_irqsub_maskack(irqno, INTMSK_UART2, 7 << 6);
 }
@@ -342,19 +342,19 @@ static struct irq_chip s3c_irq_uart2 = {
 /* ADC and Touchscreen */
 
 static void
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

arch/arm/plat-s3c24xx/s3c244x-irq.c +3 -3
Index: linux-2.6/arch/arm/plat-s3c24xx/s3c244x-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/arm/plat-s3c64xx/irq-eint.c +6 -6
Index: linux-2.6/arch/arm/plat-s3c64xx/irq-eint.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/arm/plat-s3c64xx/irq.c +7 -7
Index: linux-2.6/arch/arm/plat-s3c64xx/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/arm/plat-s5pc1xx/irq-eint.c +12 -12
Index: linux-2.6/arch/arm/plat-s5pc1xx/irq-eint.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/arm/plat-s5pc1xx/irq-gpio.c +6 -6
Index: linux-2.6/arch/arm/plat-s5pc1xx/irq-gpio.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/arm/plat-s5pc1xx/irq.c +7 -7
Index: linux-2.6/arch/arm/plat-s5pc1xx/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/arm/plat-stmp3xxx/irq.c +1 -1
Index: linux-2.6/arch/arm/plat-stmp3xxx/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/arm/plat-stmp3xxx/pinmux.c +3 -3
Index: linux-2.6/arch/arm/plat-stmp3xxx/pinmux.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/avr32/mach-at32ap/extint.c +4 -4
Index: linux-2.6/arch/avr32/mach-at32ap/extint.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/avr32/mach-at32ap/pio.c +2 -2
Index: linux-2.6/arch/avr32/mach-at32ap/pio.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/blackfin/include/asm/ipipe.h +2 -2
Index: linux-2.6/arch/blackfin/include/asm/ipipe.h
===================================================================

Lines of this file are not shown. View the raw message.

arch/blackfin/mach-common/ints-priority.c +29 -12

41 lines not on this page · raw message

arch/cris/arch-v10/kernel/irq.c +1 -1
Index: linux-2.6/arch/cris/arch-v10/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/frv/kernel/irq-mb93091.c +4 -4
Index: linux-2.6/arch/frv/kernel/irq-mb93091.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/frv/kernel/irq-mb93093.c +4 -4
Index: linux-2.6/arch/frv/kernel/irq-mb93093.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/frv/kernel/irq-mb93493.c +3 -3
Index: linux-2.6/arch/frv/kernel/irq-mb93493.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/frv/kernel/irq.c +4 -4
Index: linux-2.6/arch/frv/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/ia64/hp/sim/hpsim_irq.c +5 -1
Index: linux-2.6/arch/ia64/hp/sim/hpsim_irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/ia64/kernel/iosapic.c +20 -7
Index: linux-2.6/arch/ia64/kernel/iosapic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/ia64/kernel/irq_lsapic.c +6 -1
Index: linux-2.6/arch/ia64/kernel/irq_lsapic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/ia64/kernel/msi_ia64.c +1 -1
Index: linux-2.6/arch/ia64/kernel/msi_ia64.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/ia64/sn/kernel/irq.c +3 -3
Index: linux-2.6/arch/ia64/sn/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/ia64/sn/kernel/msi_sn.c +1 -1
Index: linux-2.6/arch/ia64/sn/kernel/msi_sn.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/m32104ut/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/m32104ut/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/m32700ut/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/m32700ut/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/mappi/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/mappi/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/mappi2/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/mappi2/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/mappi3/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/mappi3/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/oaks32r/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/oaks32r/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/opsput/setup.c +4 -4
Index: linux-2.6/arch/m32r/platforms/opsput/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m32r/platforms/usrv/setup.c +2 -2
Index: linux-2.6/arch/m32r/platforms/usrv/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m68knommu/platform/5249/intc2.c +3 -3
Index: linux-2.6/arch/m68knommu/platform/5249/intc2.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m68knommu/platform/5272/intc.c +3 -3
Index: linux-2.6/arch/m68knommu/platform/5272/intc.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m68knommu/platform/68328/ints.c +2 -2
Index: linux-2.6/arch/m68knommu/platform/68328/ints.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m68knommu/platform/68360/ints.c +3 -3
Index: linux-2.6/arch/m68knommu/platform/68360/ints.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m68knommu/platform/coldfire/intc-2.c +2 -2
Index: linux-2.6/arch/m68knommu/platform/coldfire/intc-2.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m68knommu/platform/coldfire/intc-simr.c +2 -2
Index: linux-2.6/arch/m68knommu/platform/coldfire/intc-simr.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/m68knommu/platform/coldfire/intc.c +2 -2
Index: linux-2.6/arch/m68knommu/platform/coldfire/intc.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/microblaze/kernel/intc.c +4 -4
Index: linux-2.6/arch/microblaze/kernel/intc.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/alchemy/common/irq.c +8 -8
Index: linux-2.6/arch/mips/alchemy/common/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/alchemy/devboards/pb1200/irqmap.c +3 -3
Index: linux-2.6/arch/mips/alchemy/devboards/pb1200/irqmap.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/ar7/irq.c +6 -6
Index: linux-2.6/arch/mips/ar7/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/bcm63xx/irq.c +11 -6
Index: linux-2.6/arch/mips/bcm63xx/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/cavium-octeon/octeon-irq.c +28 -12
Index: linux-2.6/arch/mips/cavium-octeon/octeon-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/dec/ioasic-irq.c +3 -3
Index: linux-2.6/arch/mips/dec/ioasic-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/dec/kn02-irq.c +3 -3
Index: linux-2.6/arch/mips/dec/kn02-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/emma/markeins/irq.c +8 -8
Index: linux-2.6/arch/mips/emma/markeins/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/jazz/irq.c +2 -2
Index: linux-2.6/arch/mips/jazz/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/i8259.c +12 -4
Index: linux-2.6/arch/mips/kernel/i8259.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/irq-gic.c +3 -3
Index: linux-2.6/arch/mips/kernel/irq-gic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/irq-gt641xx.c +4 -4
Index: linux-2.6/arch/mips/kernel/irq-gt641xx.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/irq-msc01.c +4 -4
Index: linux-2.6/arch/mips/kernel/irq-msc01.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/irq-rm7000.c +2 -2
Index: linux-2.6/arch/mips/kernel/irq-rm7000.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/irq-rm9000.c +2 -2
Index: linux-2.6/arch/mips/kernel/irq-rm9000.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/irq_cpu.c +3 -3
Index: linux-2.6/arch/mips/kernel/irq_cpu.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/kernel/irq_txx9.c +3 -3
Index: linux-2.6/arch/mips/kernel/irq_txx9.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/lasat/interrupt.c +2 -2
Index: linux-2.6/arch/mips/lasat/interrupt.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/loongson/common/bonito-irq.c +2 -2
Index: linux-2.6/arch/mips/loongson/common/bonito-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/nxp/pnx833x/common/interrupts.c +2 -2
Index: linux-2.6/arch/mips/nxp/pnx833x/common/interrupts.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/nxp/pnx8550/common/int.c +2 -2
Index: linux-2.6/arch/mips/nxp/pnx8550/common/int.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c +2 -2
Index: linux-2.6/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +3 -3
Index: linux-2.6/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/powertv/asic/irq_asic.c +2 -2
Index: linux-2.6/arch/mips/powertv/asic/irq_asic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/rb532/irq.c +3 -3
Index: linux-2.6/arch/mips/rb532/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sgi-ip22/ip22-int.c +8 -8
Index: linux-2.6/arch/mips/sgi-ip22/ip22-int.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sgi-ip27/ip27-irq.c +2 -2
Index: linux-2.6/arch/mips/sgi-ip27/ip27-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sgi-ip27/ip27-timer.c +2 -2
Index: linux-2.6/arch/mips/sgi-ip27/ip27-timer.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sgi-ip32/ip32-irq.c +11 -11
Index: linux-2.6/arch/mips/sgi-ip32/ip32-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sibyte/bcm1480/irq.c +6 -6
Index: linux-2.6/arch/mips/sibyte/bcm1480/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sibyte/sb1250/irq.c +6 -6
Index: linux-2.6/arch/mips/sibyte/sb1250/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sni/a20r.c +2 -2
Index: linux-2.6/arch/mips/sni/a20r.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sni/pcimt.c +2 -2
Index: linux-2.6/arch/mips/sni/pcimt.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sni/pcit.c +2 -2
Index: linux-2.6/arch/mips/sni/pcit.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/sni/rm200.c +6 -6
Index: linux-2.6/arch/mips/sni/rm200.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/txx9/generic/irq_tx4939.c +2 -2
Index: linux-2.6/arch/mips/txx9/generic/irq_tx4939.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/txx9/jmr3927/irq.c +2 -2
Index: linux-2.6/arch/mips/txx9/jmr3927/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/txx9/rbtx4927/irq.c +4 -4
Index: linux-2.6/arch/mips/txx9/rbtx4927/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/txx9/rbtx4938/irq.c +4 -4
Index: linux-2.6/arch/mips/txx9/rbtx4938/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/txx9/rbtx4939/irq.c +2 -2
Index: linux-2.6/arch/mips/txx9/rbtx4939/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/vr41xx/common/icu.c +4 -4
Index: linux-2.6/arch/mips/vr41xx/common/icu.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mips/vr41xx/common/irq.c +4 -4
Index: linux-2.6/arch/mips/vr41xx/common/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mn10300/kernel/irq.c +19 -7
Index: linux-2.6/arch/mn10300/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/mn10300/kernel/mn10300-serial.c +2 -2
Index: linux-2.6/arch/mn10300/kernel/mn10300-serial.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/parisc/include/asm/irq.h +2 -2
Index: linux-2.6/arch/parisc/include/asm/irq.h
===================================================================

Lines of this file are not shown. View the raw message.

arch/parisc/kernel/irq.c +2 -2
Index: linux-2.6/arch/parisc/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/include/asm/mpic.h +3 -3
Index: linux-2.6/arch/powerpc/include/asm/mpic.h
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/include/asm/qe_ic.h +3 -3
Index: linux-2.6/arch/powerpc/include/asm/qe_ic.h
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/kernel/crash.c +1 -1
Index: linux-2.6/arch/powerpc/kernel/crash.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +2 -2
Index: linux-2.6/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/52xx/media5200.c +5 -5
Index: linux-2.6/arch/powerpc/platforms/52xx/media5200.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/52xx/mpc52xx_pic.c +5 -5
Index: linux-2.6/arch/powerpc/platforms/52xx/mpc52xx_pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +2 -2
Index: linux-2.6/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/ksi8560.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/85xx/ksi8560.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/mpc85xx_ads.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/85xx/mpc85xx_ads.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/85xx/mpc85xx_ds.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/sbc8560.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/85xx/sbc8560.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/socrates_fpga_pic.c +6 -6
Index: linux-2.6/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/stx_gp3.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/85xx/stx_gp3.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/tqm85xx.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/85xx/tqm85xx.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/86xx/gef_pic.c +4 -4
Index: linux-2.6/arch/powerpc/platforms/86xx/gef_pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/86xx/pic.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/86xx/pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/8xx/m8xx_setup.c +2 -2
Index: linux-2.6/arch/powerpc/platforms/8xx/m8xx_setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/cell/axon_msi.c +7 -2
Index: linux-2.6/arch/powerpc/platforms/cell/axon_msi.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/cell/beat_interrupt.c +2 -2
Index: linux-2.6/arch/powerpc/platforms/cell/beat_interrupt.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/cell/interrupt.c +6 -6
Index: linux-2.6/arch/powerpc/platforms/cell/interrupt.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/cell/setup.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/cell/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/cell/spider-pic.c +4 -4
Index: linux-2.6/arch/powerpc/platforms/cell/spider-pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/chrp/setup.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/chrp/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/embedded6xx/flipper-pic.c +4 -4
Index: linux-2.6/arch/powerpc/platforms/embedded6xx/flipper-pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/embedded6xx/hlwd-pic.c +7 -7
Index: linux-2.6/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/iseries/irq.c +3 -3
Index: linux-2.6/arch/powerpc/platforms/iseries/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/powermac/pic.c +5 -5
Index: linux-2.6/arch/powerpc/platforms/powermac/pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/ps3/interrupt.c +3 -3
Index: linux-2.6/arch/powerpc/platforms/ps3/interrupt.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/pseries/setup.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/pseries/setup.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/pseries/xics.c +4 -4
Index: linux-2.6/arch/powerpc/platforms/pseries/xics.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/cpm1.c +3 -3
Index: linux-2.6/arch/powerpc/sysdev/cpm1.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/cpm2_pic.c +4 -4
Index: linux-2.6/arch/powerpc/sysdev/cpm2_pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/fsl_msi.c +6 -6
Index: linux-2.6/arch/powerpc/sysdev/fsl_msi.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/i8259.c +3 -3
Index: linux-2.6/arch/powerpc/sysdev/i8259.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/ipic.c +4 -4
Index: linux-2.6/arch/powerpc/sysdev/ipic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/mpc8xx_pic.c +4 -4
Index: linux-2.6/arch/powerpc/sysdev/mpc8xx_pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/mpic.c +8 -8
Index: linux-2.6/arch/powerpc/sysdev/mpic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/mpic_pasemi_msi.c +2 -2
Index: linux-2.6/arch/powerpc/sysdev/mpic_pasemi_msi.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/mpic_u3msi.c +12 -7
Index: linux-2.6/arch/powerpc/sysdev/mpic_u3msi.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/mv64x60_pic.c +7 -7
Index: linux-2.6/arch/powerpc/sysdev/mv64x60_pic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/qe_lib/qe_ic.c +2 -2
Index: linux-2.6/arch/powerpc/sysdev/qe_lib/qe_ic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/tsi108_pci.c +5 -5
Index: linux-2.6/arch/powerpc/sysdev/tsi108_pci.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/uic.c +8 -8
Index: linux-2.6/arch/powerpc/sysdev/uic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/powerpc/sysdev/xilinx_intc.c +5 -5
Index: linux-2.6/arch/powerpc/sysdev/xilinx_intc.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/score/kernel/irq.c +2 -2
Index: linux-2.6/arch/score/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-cayman/irq.c +3 -3
Index: linux-2.6/arch/sh/boards/mach-cayman/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-dreamcast/irq.c +3 -3
Index: linux-2.6/arch/sh/boards/mach-dreamcast/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-landisk/irq.c +2 -2
Index: linux-2.6/arch/sh/boards/mach-landisk/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-microdev/irq.c +7 -7
Index: linux-2.6/arch/sh/boards/mach-microdev/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-se/7206/irq.c +3 -3
Index: linux-2.6/arch/sh/boards/mach-se/7206/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-se/7343/irq.c +2 -2
Index: linux-2.6/arch/sh/boards/mach-se/7343/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-se/7722/irq.c +2 -2
Index: linux-2.6/arch/sh/boards/mach-se/7722/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-se/7724/irq.c +2 -2
Index: linux-2.6/arch/sh/boards/mach-se/7724/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/boards/mach-systemh/irq.c +7 -7
Index: linux-2.6/arch/sh/boards/mach-systemh/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/cchips/hd6446x/hd64461.c +4 -4
Index: linux-2.6/arch/sh/cchips/hd6446x/hd64461.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/kernel/cpu/irq/imask.c +2 -2
Index: linux-2.6/arch/sh/kernel/cpu/irq/imask.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sh/kernel/cpu/irq/intc-sh5.c +7 -7
Index: linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sparc/kernel/irq_64.c +3 -3
Index: linux-2.6/arch/sparc/kernel/irq_64.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/sparc/kernel/pci_msi.c +11 -2
Index: linux-2.6/arch/sparc/kernel/pci_msi.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/um/kernel/irq.c +6 -2
Index: linux-2.6/arch/um/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/include/asm/hpet.h +2 -2
Index: linux-2.6/arch/x86/include/asm/hpet.h
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/kernel/apic/io_apic.c +11 -20
Index: linux-2.6/arch/x86/kernel/apic/io_apic.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/kernel/hpet.c +2 -2
Index: linux-2.6/arch/x86/kernel/hpet.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/kernel/i8259.c +14 -5
Index: linux-2.6/arch/x86/kernel/i8259.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/kernel/irq.c +2 -2
Index: linux-2.6/arch/x86/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/kernel/uv_irq.c +7 -3
Index: linux-2.6/arch/x86/kernel/uv_irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/kernel/visws_quirks.c +1 -1
Index: linux-2.6/arch/x86/kernel/visws_quirks.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/kernel/vmiclock_32.c +3 -3
Index: linux-2.6/arch/x86/kernel/vmiclock_32.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/x86/lguest/boot.c +2 -2
Index: linux-2.6/arch/x86/lguest/boot.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/xtensa/kernel/irq.c +5 -5
Index: linux-2.6/arch/xtensa/kernel/irq.c
===================================================================

Lines of this file are not shown. View the raw message.

arch/xtensa/variants/s6000/gpio.c +6 -6
Index: linux-2.6/arch/xtensa/variants/s6000/gpio.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/dma/ipu/ipu_irq.c +3 -3
Index: linux-2.6/drivers/dma/ipu/ipu_irq.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/gpio/langwell_gpio.c +3 -3
Index: linux-2.6/drivers/gpio/langwell_gpio.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/gpio/pl061.c +4 -4
Index: linux-2.6/drivers/gpio/pl061.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/gpio/timbgpio.c +3 -3
Index: linux-2.6/drivers/gpio/timbgpio.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/gpio/vr41xx_giu.c +8 -8
Index: linux-2.6/drivers/gpio/vr41xx_giu.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/mfd/asic3.c +5 -5
Index: linux-2.6/drivers/mfd/asic3.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/mfd/ezx-pcap.c +3 -3
Index: linux-2.6/drivers/mfd/ezx-pcap.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/mfd/htc-egpio.c +3 -3
Index: linux-2.6/drivers/mfd/htc-egpio.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/mfd/t7l66xb.c +2 -2
Index: linux-2.6/drivers/mfd/t7l66xb.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/mfd/tc6393xb.c +3 -3
Index: linux-2.6/drivers/mfd/tc6393xb.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/mfd/twl4030-irq.c +2 -2
Index: linux-2.6/drivers/mfd/twl4030-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/mfd/wm831x-irq.c +2 -2
Index: linux-2.6/drivers/mfd/wm831x-irq.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/misc/sgi-gru/grufile.c +1 -1
Index: linux-2.6/drivers/misc/sgi-gru/grufile.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/pci/dmar.c +2 -2
Index: linux-2.6/drivers/pci/dmar.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/pci/htirq.c +2 -2
Index: linux-2.6/drivers/pci/htirq.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/pci/msi.c +2 -2
Index: linux-2.6/drivers/pci/msi.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/vlynq/vlynq.c +4 -4
Index: linux-2.6/drivers/vlynq/vlynq.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/xen/events.c +15 -3
Index: linux-2.6/drivers/xen/events.c
===================================================================

Lines of this file are not shown. View the raw message.

include/linux/dmar.h +2 -2
Index: linux-2.6/include/linux/dmar.h
===================================================================

Lines of this file are not shown. View the raw message.

include/linux/htirq.h +3 -2
Index: linux-2.6/include/linux/htirq.h
===================================================================

Lines of this file are not shown. View the raw message.

include/linux/irq.h +9 -9
Index: linux-2.6/include/linux/irq.h
===================================================================

Lines of this file are not shown. View the raw message.

include/linux/msi.h +2 -2
Index: linux-2.6/include/linux/msi.h
===================================================================

Lines of this file are not shown. View the raw message.

kernel/irq/chip.c +13 -13
Index: linux-2.6/kernel/irq/chip.c
===================================================================

Lines of this file are not shown. View the raw message.

kernel/irq/handle.c +10 -8
Index: linux-2.6/kernel/irq/handle.c
===================================================================

Lines of this file are not shown. View the raw message.

kernel/irq/manage.c +1 -1
Index: linux-2.6/kernel/irq/manage.c
===================================================================

Lines of this file are not shown. View the raw message.

kernel/irq/migration.c +5 -9
Index: linux-2.6/kernel/irq/migration.c
===================================================================

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.

#39 lore raw

Re: [RFC PATCH 3/3] genericirq: change ack/mask in irq_chip to take irq_desc in addition to irq

Quoted 8 lines · Yinghai Lu

will have

void            (*ack)(unsigned int irq, struct irq_desc *desc);
void            (*mask)(unsigned int irq, struct irq_desc *desc);
void            (*mask_ack)(unsigned int irq, struct irq_desc *desc);
void            (*unmask)(unsigned int irq, struct irq_desc *desc);
void            (*eoi)(unsigned int irq, struct irq_desc *desc);

so for sparseirq with raidix tree, we don't call extra irq_to_desc, and could use desc directly

This doesn't look bad.

May I ask why these methods and why pass both irq and desc instead of just desc?

I think in the long run passing both irq and desc through several functions may incur some maintenance cost that it would be nice not to pay (register pressure and increased chance of typos).

With a big sweeping change like this I want to be certain we won't change our minds and come back and want to change it all again.

Oh and a multiarch patch like this should really cc linux-arch so the arch maintainers can see it.

In passing it looks like want to transform get_irq_data in hpet.c to get_irq_desc_data.

Eric

#40 lore raw

Re: [RFC PATCH 3/3] genericirq: change ack/mask in irq_chip to take irq_desc in addition to irq

Quoted 8 lines · Eric W. Biederman

May I ask why these methods and why pass both irq and desc instead of just desc?

I think in the long run passing both irq and desc through several functions may incur some maintenance cost that it would be nice not to pay (register pressure and increased chance of typos).

Indeed; if the IRQ number is needed the function should just get it from desc->irq.

-hpa

author
#41 lore raw

Re: [RFC PATCH 3/3] genericirq: change ack/mask in irq_chip to take irq_desc in addition to irq

Quoted 5 lines · H. Peter Anvin
Quoted 4 lines · Eric W. Biederman

May I ask why these methods and why pass both irq and desc instead of just desc?

Quoted 7 lines
Quoted 4 lines

I think in the long run passing both irq and desc through several functions may incur some maintenance cost that it would be nice not to pay (register pressure and increased chance of typos).

Indeed; if the IRQ number is needed the function should just get it from desc->irq.

ok, change unsigned int irq to struct irq_desc *desc in irq_chip member...

YH

#43 lore raw
In reply to Yinghai Lu
Quoted 33 lines · Yinghai Lu
Quoted 22 lines · Eric W. Biederman
Quoted 7 lines · Yinghai Lu

---------spareirq radix tree related ---------------- 94007e8: irq: remove not need bootmem code 4b0d3fa: radix: move radix init early
56af1a9: sparseirq: change irq_desc_ptrs to static
b236235: sparseirq: use radix_tree instead of ptrs array 5918787: x86: remove arch_probe_nr_irqs

Quoted 6 lines

so could reduce nr_irqs limitation for bunch ixgbe...

---------------x86 logical flat related -----------
f5954c4: use nr_cpus= to set nr_cpu_ids early
7b8d6a9: x86: use num_processors for possible cpus
d79d1de: x86: make 32bit apic flat to physflat switch like 64bit

Thanks for keeping this work alive.

I just skimmed through do_IRQ and I happened to notice that we have an unnecessary inefficiency that using a radix tree for irq_to_desc will magnify.

Quoted 7 lines

handle_irq should take an struct irq_desc * instead of a unsigned int irq.

and the per cpu vector_irq array should become a per cpu vector_desc array.

As soon as irq_to_desc is more than &irq_desc[irq] this saves us work and cache line misses at the cost of a simple code cleanup.

please check

Quoted 7 lines

Subject: [PATCH] x86: use vector_desc instead of vector_irq

Eric pointed out that radix tree version of irq_to_desc will magnify delay on the path of handle_irq.
use vector_desc to reduce the calling of irq_to_desc.

next step: need to change all ack, mask, umask, eoi for all irq_chip to take irq_desc

Overall this looks good, and your next step sounds good.

Thanks,
Eric

Quoted 5 lines

Index: linux-2.6/arch/x86/kernel/irq_32.c
===================================================================

arch/x86/kernel/irq_32.c static inline int · line 198

Quoted 9 lines
arch/x86/kernel/irq_32.c +2 -2
@@ -192,17 +192,17 @@ static inline int
 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) { return 0; }
 #endif
 
-bool handle_irq(unsigned irq, struct pt_regs *regs)
+bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
 {
-	struct irq_desc *desc;
 	int overflow;
+	int irq;

This should be:

	unsigned irq;

irq numbers are unsigned, and with sparse allocation we might even see irq numbers large enough for that to matter.

Quoted 35 lines
arch/x86/kernel/irq_32.c +1 -1
 	overflow = check_stack_overflow();
 
-	desc = irq_to_desc(irq);
 	if (unlikely(!desc))
 		return false;
 
+	irq = desc->irq;
 	if (!execute_on_irq_stack(overflow, desc, irq)) {
 		if (unlikely(overflow))
 			print_stack_overflow();
 

Index: linux-2.6/arch/x86/kernel/irqinit.c
===================================================================

arch/x86/kernel/irqinit.c +2 -4
@@ -83,16 +83,14 @@ static struct irqaction irq2 = {
 	.name = "cascade",
 };
 
-DEFINE_PER_CPU(vector_irq_t, vector_irq) = {
-	[0 ... NR_VECTORS - 1] = -1,
-};
+DEFINE_PER_CPU(vector_desc_t, vector_desc);
 
 int vector_used_by_percpu_irq(unsigned int vector)
 {
 	int cpu;
 
 	for_each_online_cpu(cpu) {
-		if (per_cpu(vector_irq, cpu)[vector] != -1)
+		if (per_cpu(vector_desc, cpu)[vector] != NULL)
 			return 1;
 	}
 

arch/x86/kernel/irqinit.c void __init init_IRQ(void) · line 140

Quoted 5 lines
arch/x86/kernel/irqinit.c +1 -1
@@ -139,7 +137,7 @@ void __init init_IRQ(void)
 	 * irq's migrate etc.
 	 */
 	for (i = 0; i < nr_legacy_irqs; i++)
-		per_cpu(vector_irq, 0)[IRQ0_VECTOR + i] = i;
+		per_cpu(vector_desc, 0)[IRQ0_VECTOR + i] = irq_to_desc(i);

I am not familiar with this hunk (it must be in the x86 tree). Are you certain we have allocated the legacy irq desc here?

Quoted 2 lines
arch/x86/kernel/irqinit.c +0 -0
 	x86_init.irqs.intr_init();
 }
author
#44 lore raw
Quoted 23 lines · Eric W. Biederman
Quoted 23 lines

Index: linux-2.6/arch/x86/kernel/irqinit.c
===================================================================

arch/x86/kernel/irqinit.c +2 -4
@@ -83,16 +83,14 @@ static struct irqaction irq2 = {
 	.name = "cascade",
 };
 
-DEFINE_PER_CPU(vector_irq_t, vector_irq) = {
-	[0 ... NR_VECTORS - 1] = -1,
-};
+DEFINE_PER_CPU(vector_desc_t, vector_desc);
 
 int vector_used_by_percpu_irq(unsigned int vector)
 {
 	int cpu;
 
 	for_each_online_cpu(cpu) {
-		if (per_cpu(vector_irq, cpu)[vector] != -1)
+		if (per_cpu(vector_desc, cpu)[vector] != NULL)
 			return 1;
 	}
 
Quoted 9 lines

arch/x86/kernel/irqinit.c void __init init_IRQ(void) · line 140

Quoted 6 lines
arch/x86/kernel/irqinit.c +1 -1
@@ -139,7 +137,7 @@ void __init init_IRQ(void)
 	 * irq's migrate etc.
 	 */
 	for (i = 0; i < nr_legacy_irqs; i++)
-		per_cpu(vector_irq, 0)[IRQ0_VECTOR + i] = i;
+		per_cpu(vector_desc, 0)[IRQ0_VECTOR + i] = irq_to_desc(i);

I am not familiar with this hunk (it must be in the x86 tree). Are you certain we have allocated the legacy irq desc here?

yes.

early_irq_init() is called before init_IRQ in start_kernel()

it will have irq_desc for legacy ready.

YH