--- /var/linuxes/linux-next/arch/arm/common/locomo.c	2011-10-27 01:37:56.000000000 +0200
+++ /var/julia/linuxcopy/arch/arm/common/locomo.c	2015-06-13 10:31:21.727542661 +0200
@@ -138,8 +138,9 @@ static struct locomo_dev_info locomo_dev
 	},
 };
 
-static void locomo_handler(unsigned int irq, struct irq_desc *desc)
+static void locomo_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct locomo *lchip = irq_get_chip_data(irq);
 	int req, i;
 
--- /var/linuxes/linux-next/arch/arm/common/sa1111.c	2014-11-25 11:25:19.660159728 +0100
+++ /var/julia/linuxcopy/arch/arm/common/sa1111.c	2015-06-13 10:31:22.087542648 +0200
@@ -197,8 +197,9 @@ static struct sa1111_dev_info sa1111_dev
  * will call us again if there are more interrupts to process.
  */
 static void
-sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)
+sa1111_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	unsigned int stat0, stat1, i;
 	struct sa1111 *sachip = irq_get_handler_data(irq);
 	void __iomem *mapbase = sachip->base + SA1111_INTC;
--- /var/linuxes/linux-next/arch/arm/mach-dove/irq.c	2014-05-03 16:25:24.844578878 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-dove/irq.c	2015-06-13 10:31:22.239542642 +0200
@@ -69,8 +69,9 @@ static struct irq_chip pmu_irq_chip = {
 	.irq_ack	= pmu_irq_ack,
 };
 
-static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void pmu_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	unsigned long cause = readl(PMU_INTERRUPT_CAUSE);
 
 	cause &= readl(PMU_INTERRUPT_MASK);
--- /var/linuxes/linux-next/arch/arm/mach-footbridge/isa-irq.c	2011-10-27 01:37:56.000000000 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-footbridge/isa-irq.c	2015-06-13 10:31:22.723542624 +0200
@@ -88,7 +88,7 @@ static struct irq_chip isa_hi_chip = {
 };
 
 static void
-isa_irq_handler(unsigned int irq, struct irq_desc *desc)
+isa_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE;
 
--- /var/linuxes/linux-next/arch/arm/mach-gemini/gpio.c	2013-10-31 21:45:23.000000000 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-gemini/gpio.c	2015-06-13 10:31:20.863542693 +0200
@@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_
 	return 0;
 }
 
-static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void gpio_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned int port = (unsigned int)irq_desc_get_handler_data(desc);
 	unsigned int gpio_irq_no, irq_stat;
--- /var/linuxes/linux-next/arch/arm/mach-imx/3ds_debugboard.c	2012-10-18 18:34:34.000000000 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-imx/3ds_debugboard.c	2015-06-13 10:31:21.459542671 +0200
@@ -85,7 +85,7 @@ static struct platform_device smsc_lan92
 	.resource = smsc911x_resources,
 };
 
-static void mxc_expio_irq_handler(u32 irq, struct irq_desc *desc)
+static void mxc_expio_irq_handler(u32 __irq, struct irq_desc *desc)
 {
 	u32 imr_val;
 	u32 int_valid;
--- /var/linuxes/linux-next/arch/arm/mach-imx/mach-mx31ads.c	2014-08-21 13:30:52.108511549 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-imx/mach-mx31ads.c	2015-06-13 10:31:21.279542678 +0200
@@ -154,7 +154,7 @@ static inline void mxc_init_imx_uart(voi
 	imx31_add_imx_uart0(&uart_pdata);
 }
 
-static void mx31ads_expio_irq_handler(u32 irq, struct irq_desc *desc)
+static void mx31ads_expio_irq_handler(u32 __irq, struct irq_desc *desc)
 {
 	u32 imr_val;
 	u32 int_valid;
--- /var/linuxes/linux-next/arch/arm/mach-iop13xx/msi.c	2014-11-29 15:47:36.682720326 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-iop13xx/msi.c	2015-06-13 10:31:20.127542720 +0200
@@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = {
 	write_imipr_3,
 };
 
-static void iop13xx_msi_handler(unsigned int irq, struct irq_desc *desc)
+static void iop13xx_msi_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	int i, j;
 	unsigned long status;
--- /var/linuxes/linux-next/arch/arm/mach-lpc32xx/irq.c	2012-11-25 19:53:20.000000000 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-lpc32xx/irq.c	2015-06-13 10:31:17.531542817 +0200
@@ -370,7 +370,7 @@ static struct irq_chip lpc32xx_irq_chip
 	.irq_set_wake = lpc32xx_irq_wake
 };
 
-static void lpc32xx_sic1_handler(unsigned int irq, struct irq_desc *desc)
+static void lpc32xx_sic1_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long ints = __raw_readl(LPC32XX_INTC_STAT(LPC32XX_SIC1_BASE));
 
@@ -383,7 +383,7 @@ static void lpc32xx_sic1_handler(unsigne
 	}
 }
 
-static void lpc32xx_sic2_handler(unsigned int irq, struct irq_desc *desc)
+static void lpc32xx_sic2_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long ints = __raw_readl(LPC32XX_INTC_STAT(LPC32XX_SIC2_BASE));
 
--- /var/linuxes/linux-next/arch/arm/mach-netx/generic.c	2013-06-29 19:28:56.000000000 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-netx/generic.c	2015-06-13 10:31:22.387542636 +0200
@@ -70,7 +70,7 @@ static struct platform_device *devices[]
 #endif
 
 static void
-netx_hif_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
+netx_hif_demux_handler(unsigned int __irq_unused, struct irq_desc *desc)
 {
 	unsigned int irq = NETX_IRQ_HIF_CHAINED(0);
 	unsigned int stat;
--- /var/linuxes/linux-next/arch/arm/mach-omap1/fpga.c	2013-10-31 21:45:23.000000000 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-omap1/fpga.c	2015-06-13 10:31:20.639542701 +0200
@@ -87,7 +87,8 @@ static void fpga_mask_ack_irq(struct irq
 	fpga_ack_irq(d);
 }
 
-static void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)
+static void innovator_fpga_IRQ_demux(unsigned int __irq,
+				     struct irq_desc *desc)
 {
 	u32 stat;
 	int fpga_irq;
--- /var/linuxes/linux-next/arch/arm/mach-omap2/prm_common.c	2015-04-02 22:08:46.059526939 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-omap2/prm_common.c	2015-06-13 10:31:23.367542600 +0200
@@ -102,7 +102,7 @@ static void omap_prcm_events_filter_prio
  * dispatched accordingly. Clearing of the wakeup events should be
  * done by the SoC specific individual handlers.
  */
-static void omap_prcm_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void omap_prcm_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG];
 	unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG];
--- /var/linuxes/linux-next/arch/arm/mach-pxa/balloon3.c	2014-06-28 20:09:11.297152825 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-pxa/balloon3.c	2015-06-13 10:31:19.147542757 +0200
@@ -496,7 +496,7 @@ static struct irq_chip balloon3_irq_chip
 	.irq_unmask	= balloon3_unmask_irq,
 };
 
-static void balloon3_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void balloon3_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long pending = __raw_readl(BALLOON3_INT_CONTROL_REG) &
 					balloon3_irq_enabled;
--- /var/linuxes/linux-next/arch/arm/mach-pxa/cm-x2xx-pci.c	2012-05-08 09:06:48.000000000 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-pxa/cm-x2xx-pci.c	2015-06-13 10:31:19.295542751 +0200
@@ -29,8 +29,9 @@
 void __iomem *it8152_base_address;
 static int cmx2xx_it8152_irq_gpio;
 
-static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void cmx2xx_it8152_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	/* clear our parent irq */
 	desc->irq_data.chip->irq_ack(&desc->irq_data);
 
--- /var/linuxes/linux-next/arch/arm/mach-pxa/lpd270.c	2015-03-12 22:23:12.058844788 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-pxa/lpd270.c	2015-06-13 10:31:19.475542745 +0200
@@ -120,7 +120,7 @@ static struct irq_chip lpd270_irq_chip =
 	.irq_unmask	= lpd270_unmask_irq,
 };
 
-static void lpd270_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void lpd270_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long pending;
 
--- /var/linuxes/linux-next/arch/arm/mach-pxa/pcm990-baseboard.c	2013-12-15 19:52:45.000000000 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-pxa/pcm990-baseboard.c	2015-06-13 10:31:19.727542735 +0200
@@ -284,7 +284,7 @@ static struct irq_chip pcm990_irq_chip =
 	.irq_unmask	= pcm990_unmask_irq,
 };
 
-static void pcm990_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void pcm990_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long pending;
 
--- /var/linuxes/linux-next/arch/arm/mach-pxa/viper.c	2014-06-28 20:09:11.297152825 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-pxa/viper.c	2015-06-13 10:31:18.591542778 +0200
@@ -276,7 +276,7 @@ static inline unsigned long viper_irq_pe
 			viper_irq_enabled_mask;
 }
 
-static void viper_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void viper_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long pending;
 
--- /var/linuxes/linux-next/arch/arm/mach-pxa/zeus.c	2015-03-31 10:05:04.255568993 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-pxa/zeus.c	2015-06-13 10:31:18.867542767 +0200
@@ -105,7 +105,7 @@ static inline unsigned long zeus_irq_pen
 	return __raw_readw(ZEUS_CPLD_ISA_IRQ) & zeus_irq_enabled_mask;
 }
 
-static void zeus_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void zeus_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long pending;
 
--- /var/linuxes/linux-next/arch/arm/mach-rpc/ecard.c	2012-10-06 14:13:21.000000000 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-rpc/ecard.c	2015-06-13 10:31:17.159542831 +0200
@@ -552,7 +552,7 @@ static void ecard_check_lockup(struct ir
 }
 
 static void
-ecard_irq_handler(unsigned int irq, struct irq_desc *desc)
+ecard_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	ecard_t *ec;
 	int called = 0;
--- /var/linuxes/linux-next/arch/arm/mach-s3c24xx/bast-irq.c	2013-03-28 19:43:15.000000000 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-s3c24xx/bast-irq.c	2015-06-13 10:31:19.935542728 +0200
@@ -101,7 +101,7 @@ static struct irq_chip  bast_pc104_chip
 };
 
 static void
-bast_irq_pc104_demux(unsigned int irq,
+bast_irq_pc104_demux(unsigned int __irq,
 		     struct irq_desc *desc)
 {
 	unsigned int stat;
--- /var/linuxes/linux-next/arch/arm/mach-s3c64xx/common.c	2014-09-13 07:58:59.031341188 +0200
+++ /var/julia/linuxcopy/arch/arm/mach-s3c64xx/common.c	2015-06-13 10:31:18.295542789 +0200
@@ -389,22 +389,22 @@ static inline void s3c_irq_demux_eint(un
 	}
 }
 
-static void s3c_irq_demux_eint0_3(unsigned int irq, struct irq_desc *desc)
+static void s3c_irq_demux_eint0_3(unsigned int __irq, struct irq_desc *desc)
 {
 	s3c_irq_demux_eint(0, 3);
 }
 
-static void s3c_irq_demux_eint4_11(unsigned int irq, struct irq_desc *desc)
+static void s3c_irq_demux_eint4_11(unsigned int __irq, struct irq_desc *desc)
 {
 	s3c_irq_demux_eint(4, 11);
 }
 
-static void s3c_irq_demux_eint12_19(unsigned int irq, struct irq_desc *desc)
+static void s3c_irq_demux_eint12_19(unsigned int __irq, struct irq_desc *desc)
 {
 	s3c_irq_demux_eint(12, 19);
 }
 
-static void s3c_irq_demux_eint20_27(unsigned int irq, struct irq_desc *desc)
+static void s3c_irq_demux_eint20_27(unsigned int __irq, struct irq_desc *desc)
 {
 	s3c_irq_demux_eint(20, 27);
 }
--- /var/linuxes/linux-next/arch/arm/mach-sa1100/neponset.c	2015-03-12 22:23:12.058844788 +0100
+++ /var/julia/linuxcopy/arch/arm/mach-sa1100/neponset.c	2015-06-13 10:31:22.571542630 +0200
@@ -166,7 +166,7 @@ static struct sa1100_port_fns neponset_p
  * ensure that the IRQ signal is deasserted before returning.  This
  * is rather unfortunate.
  */
-static void neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void neponset_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	struct neponset_drvdata *d = irq_desc_get_handler_data(desc);
 	unsigned int irr;
--- /var/linuxes/linux-next/arch/arm/plat-orion/gpio.c	2014-11-29 15:47:36.682720326 +0100
+++ /var/julia/linuxcopy/arch/arm/plat-orion/gpio.c	2015-06-13 10:31:20.419542710 +0200
@@ -407,8 +407,9 @@ static int gpio_irq_set_type(struct irq_
 	return 0;
 }
 
-static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+static void gpio_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct orion_gpio_chip *ochip = irq_get_handler_data(irq);
 	u32 cause, type;
 	int i;
--- /var/linuxes/linux-next/arch/avr32/mach-at32ap/extint.c	2011-10-27 01:37:56.000000000 +0200
+++ /var/julia/linuxcopy/arch/avr32/mach-at32ap/extint.c	2015-06-13 10:31:12.367543009 +0200
@@ -144,7 +144,7 @@ static struct irq_chip eic_chip = {
 	.irq_set_type	= eic_set_irq_type,
 };
 
-static void demux_eic_irq(unsigned int irq, struct irq_desc *desc)
+static void demux_eic_irq(unsigned int __irq, struct irq_desc *desc)
 {
 	struct eic *eic = irq_desc_get_handler_data(desc);
 	unsigned long status, pending;
--- /var/linuxes/linux-next/arch/avr32/mach-at32ap/pio.c	2011-10-27 01:40:04.000000000 +0200
+++ /var/julia/linuxcopy/arch/avr32/mach-at32ap/pio.c	2015-06-13 10:31:12.619543000 +0200
@@ -281,8 +281,9 @@ static struct irq_chip gpio_irqchip = {
 	.irq_set_type	= gpio_irq_type,
 };
 
-static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+static void gpio_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct pio_device	*pio = irq_desc_get_chip_data(desc);
 	unsigned		gpio_irq;
 
--- /var/linuxes/linux-next/arch/blackfin/mach-bf537/ints-priority.c	2011-10-27 01:37:56.000000000 +0200
+++ /var/julia/linuxcopy/arch/blackfin/mach-bf537/ints-priority.c	2015-06-13 10:31:07.263543199 +0200
@@ -89,7 +89,7 @@ static struct irq_chip bf537_generic_err
 	.irq_unmask = bf537_generic_error_unmask_irq,
 };
 
-static void bf537_demux_error_irq(unsigned int int_err_irq,
+static void bf537_demux_error_irq(unsigned int __int_err_irq,
 				  struct irq_desc *inta_desc)
 {
 	int irq = 0;
@@ -182,9 +182,10 @@ static struct irq_chip bf537_mac_rx_irqc
 	.irq_unmask = bf537_mac_rx_unmask_irq,
 };
 
-static void bf537_demux_mac_rx_irq(unsigned int int_irq,
+static void bf537_demux_mac_rx_irq(unsigned int __int_irq,
 				   struct irq_desc *desc)
 {
+	unsigned int int_irq = irq_desc_get_irq(desc);
 	if (bfin_read_DMA1_IRQ_STATUS() & (DMA_DONE | DMA_ERR))
 		bfin_handle_irq(IRQ_MAC_RX);
 	else
--- /var/linuxes/linux-next/arch/blackfin/mach-common/ints-priority.c	2015-01-27 11:54:45.061642200 +0100
+++ /var/julia/linuxcopy/arch/blackfin/mach-common/ints-priority.c	2015-06-13 10:31:27.939542430 +0200
@@ -655,7 +655,7 @@ static struct irq_chip bfin_mac_status_i
 	.irq_set_wake = bfin_mac_status_set_wake,
 };
 
-void bfin_demux_mac_status_irq(unsigned int int_err_irq,
+void bfin_demux_mac_status_irq(unsigned int ____int_err_irq,
 			       struct irq_desc *inta_desc)
 {
 	int i, irq = 0;
@@ -824,9 +824,10 @@ static void bfin_demux_gpio_block(unsign
 	}
 }
 
-void bfin_demux_gpio_irq(unsigned int inta_irq,
-			struct irq_desc *desc)
+void bfin_demux_gpio_irq(unsigned int __inta_irq,
+			 struct irq_desc *desc)
 {
+	unsigned int inta_irq = irq_desc_get_irq(desc);
 	unsigned int irq;
 
 	switch (inta_irq) {
--- /var/linuxes/linux-next/arch/c6x/platforms/megamod-pic.c	2012-07-24 10:03:40.000000000 +0200
+++ /var/julia/linuxcopy/arch/c6x/platforms/megamod-pic.c	2015-06-13 10:31:12.147543017 +0200
@@ -93,7 +93,7 @@ static struct irq_chip megamod_chip = {
 	.irq_unmask	= unmask_megamod,
 };
 
-static void megamod_irq_cascade(unsigned int irq, struct irq_desc *desc)
+static void megamod_irq_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct megamod_cascade_data *cascade;
 	struct megamod_pic *pic;
--- /var/linuxes/linux-next/arch/m68k/amiga/amiints.c	2011-11-03 17:13:36.000000000 +0100
+++ /var/julia/linuxcopy/arch/m68k/amiga/amiints.c	2015-06-13 10:31:05.111543279 +0200
@@ -46,7 +46,7 @@ static struct irq_chip amiga_irq_chip =
  * The builtin Amiga hardware interrupt handlers.
  */
 
-static void ami_int1(unsigned int irq, struct irq_desc *desc)
+static void ami_int1(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
@@ -69,7 +69,7 @@ static void ami_int1(unsigned int irq, s
 	}
 }
 
-static void ami_int3(unsigned int irq, struct irq_desc *desc)
+static void ami_int3(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
@@ -92,7 +92,7 @@ static void ami_int3(unsigned int irq, s
 	}
 }
 
-static void ami_int4(unsigned int irq, struct irq_desc *desc)
+static void ami_int4(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
@@ -121,7 +121,7 @@ static void ami_int4(unsigned int irq, s
 	}
 }
 
-static void ami_int5(unsigned int irq, struct irq_desc *desc)
+static void ami_int5(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
 
--- /var/linuxes/linux-next/arch/m68k/coldfire/intc-5272.c	2014-09-09 13:39:34.559435205 +0200
+++ /var/julia/linuxcopy/arch/m68k/coldfire/intc-5272.c	2015-06-13 10:31:04.563543299 +0200
@@ -143,8 +143,9 @@ static int intc_irq_set_type(struct irq_
  * We need to be careful with the masking/acking due to the side effects
  * of masking an interrupt.
  */
-static void intc_external_irq(unsigned int irq, struct irq_desc *desc)
+static void intc_external_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	irq_desc_get_chip(desc)->irq_ack(&desc->irq_data);
 	handle_simple_irq(irq, desc);
 }
--- /var/linuxes/linux-next/arch/m68k/mac/baboon.c	2011-11-19 20:46:33.000000000 +0100
+++ /var/julia/linuxcopy/arch/m68k/mac/baboon.c	2015-06-13 10:31:05.247543274 +0200
@@ -45,7 +45,7 @@ void __init baboon_init(void)
  * Baboon interrupt handler. This works a lot like a VIA.
  */
 
-static void baboon_irq(unsigned int irq, struct irq_desc *desc)
+static void baboon_irq(unsigned int __irq, struct irq_desc *desc)
 {
 	int irq_bit, irq_num;
 	unsigned char events;
--- /var/linuxes/linux-next/arch/m68k/mac/oss.c	2015-04-02 22:08:46.063526939 +0200
+++ /var/julia/linuxcopy/arch/m68k/mac/oss.c	2015-06-13 10:31:06.483543228 +0200
@@ -63,8 +63,9 @@ void __init oss_nubus_init(void)
  * Handle miscellaneous OSS interrupts.
  */
 
-static void oss_irq(unsigned int irq, struct irq_desc *desc)
+static void oss_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	int events = oss->irq_pending &
 	             (OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM);
 
@@ -97,7 +98,7 @@ static void oss_irq(unsigned int irq, st
  * Unlike the VIA/RBV this is on its own autovector interrupt level.
  */
 
-static void oss_nubus_irq(unsigned int irq, struct irq_desc *desc)
+static void oss_nubus_irq(unsigned int __irq, struct irq_desc *desc)
 {
 	int events, irq_bit, i;
 
--- /var/linuxes/linux-next/arch/m68k/mac/psc.c	2013-11-28 10:47:05.000000000 +0100
+++ /var/julia/linuxcopy/arch/m68k/mac/psc.c	2015-06-13 10:31:05.391543269 +0200
@@ -113,8 +113,9 @@ void __init psc_init(void)
  * PSC interrupt handler. It's a lot like the VIA interrupt handler.
  */
 
-static void psc_irq(unsigned int irq, struct irq_desc *desc)
+static void psc_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	unsigned int offset = (unsigned int)irq_desc_get_handler_data(desc);
 	int pIFR	= pIFRbase + offset;
 	int pIER	= pIERbase + offset;
--- /var/linuxes/linux-next/arch/m68k/mac/via.c	2013-11-28 10:47:05.000000000 +0100
+++ /var/julia/linuxcopy/arch/m68k/mac/via.c	2015-06-13 10:31:27.427542449 +0200
@@ -446,7 +446,7 @@ void via_nubus_irq_shutdown(int irq)
  * via6522.c :-), disable/pending masks added.
  */
 
-void via1_irq(unsigned int irq, struct irq_desc *desc)
+void via1_irq(unsigned int ____irq, struct irq_desc *desc)
 {
 	int irq_num;
 	unsigned char irq_bit, events;
@@ -467,7 +467,7 @@ void via1_irq(unsigned int irq, struct i
 	} while (events >= irq_bit);
 }
 
-static void via2_irq(unsigned int irq, struct irq_desc *desc)
+static void via2_irq(unsigned int __irq, struct irq_desc *desc)
 {
 	int irq_num;
 	unsigned char irq_bit, events;
@@ -493,7 +493,7 @@ static void via2_irq(unsigned int irq, s
  * VIA2 dispatcher as a fast interrupt handler.
  */
 
-void via_nubus_irq(unsigned int irq, struct irq_desc *desc)
+void via_nubus_irq(unsigned int __irq, struct irq_desc *desc)
 {
 	int slot_irq;
 	unsigned char slot_bit, events;
--- /var/linuxes/linux-next/arch/mips/alchemy/common/irq.c	2014-08-06 11:35:13.036972463 +0200
+++ /var/julia/linuxcopy/arch/mips/alchemy/common/irq.c	2015-06-13 10:31:09.043543133 +0200
@@ -865,7 +865,7 @@ DISP(ic0r1, AU1000_INTC0_INT_BASE, AU100
 DISP(ic1r0, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ0INT)
 DISP(ic1r1, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ1INT)
 
-static void alchemy_gpic_dispatch(unsigned int irq, struct irq_desc *d)
+static void alchemy_gpic_dispatch(unsigned int __irq, struct irq_desc *d)
 {
 	int i = __raw_readl(AU1300_GPIC_ADDR + AU1300_GPIC_PRIENC);
 	generic_handle_irq(ALCHEMY_GPIC_INT_BASE + i);
--- /var/linuxes/linux-next/arch/mips/alchemy/devboards/bcsr.c	2013-01-26 09:57:59.000000000 +0100
+++ /var/julia/linuxcopy/arch/mips/alchemy/devboards/bcsr.c	2015-06-13 10:31:08.667543147 +0200
@@ -85,8 +85,9 @@ EXPORT_SYMBOL_GPL(bcsr_mod);
 /*
  * DB1200/PB1200 CPLD IRQ muxer
  */
-static void bcsr_csc_handler(unsigned int irq, struct irq_desc *d)
+static void bcsr_csc_handler(unsigned int __irq, struct irq_desc *d)
 {
+	unsigned int irq = irq_desc_get_irq(d);
 	unsigned short bisr = __raw_readw(bcsr_virt + BCSR_REG_INTSTAT);
 
 	disable_irq_nosync(irq);
--- /var/linuxes/linux-next/arch/mips/ath25/ar2315.c	2015-06-11 07:18:47.986399429 +0200
+++ /var/julia/linuxcopy/arch/mips/ath25/ar2315.c	2015-06-13 10:31:11.607543037 +0200
@@ -69,7 +69,7 @@ static struct irqaction ar2315_ahb_err_i
 	.name		= "ar2315-ahb-error",
 };
 
-static void ar2315_misc_irq_handler(unsigned irq, struct irq_desc *desc)
+static void ar2315_misc_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
 	u32 pending = ar2315_rst_reg_read(AR2315_ISR) &
 		      ar2315_rst_reg_read(AR2315_IMR);
--- /var/linuxes/linux-next/arch/mips/ath25/ar5312.c	2015-06-11 07:18:47.986399429 +0200
+++ /var/julia/linuxcopy/arch/mips/ath25/ar5312.c	2015-06-13 10:31:11.331543048 +0200
@@ -73,7 +73,7 @@ static struct irqaction ar5312_ahb_err_i
 	.name    = "ar5312-ahb-error",
 };
 
-static void ar5312_misc_irq_handler(unsigned irq, struct irq_desc *desc)
+static void ar5312_misc_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
 	u32 pending = ar5312_rst_reg_read(AR5312_ISR) &
 		      ar5312_rst_reg_read(AR5312_IMR);
--- /var/linuxes/linux-next/arch/mips/ath79/irq.c	2015-06-11 07:18:47.990399429 +0200
+++ /var/julia/linuxcopy/arch/mips/ath79/irq.c	2015-06-13 10:31:10.131543092 +0200
@@ -27,7 +27,7 @@
 #include "common.h"
 #include "machtypes.h"
 
-static void ath79_misc_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ath79_misc_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	void __iomem *base = ath79_reset_base;
 	u32 pending;
@@ -120,8 +120,9 @@ static void __init ath79_misc_irq_init(v
 	irq_set_chained_handler(ATH79_CPU_IRQ(6), ath79_misc_irq_handler);
 }
 
-static void ar934x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
+static void ar934x_ip2_irq_dispatch(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	u32 status;
 
 	disable_irq_nosync(irq);
@@ -153,8 +154,10 @@ static void ar934x_ip2_irq_init(void)
 	irq_set_chained_handler(ATH79_CPU_IRQ(2), ar934x_ip2_irq_dispatch);
 }
 
-static void qca955x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
+static void qca955x_ip2_irq_dispatch(unsigned int __irq,
+				     struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	u32 status;
 
 	disable_irq_nosync(irq);
@@ -181,8 +184,10 @@ enable:
 	enable_irq(irq);
 }
 
-static void qca955x_ip3_irq_dispatch(unsigned int irq, struct irq_desc *desc)
+static void qca955x_ip3_irq_dispatch(unsigned int __irq,
+				     struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	u32 status;
 
 	disable_irq_nosync(irq);
--- /var/linuxes/linux-next/arch/mips/jz4740/gpio.c	2015-06-11 07:18:48.006399428 +0200
+++ /var/julia/linuxcopy/arch/mips/jz4740/gpio.c	2015-06-13 10:31:08.479543154 +0200
@@ -296,7 +296,8 @@ static void jz_gpio_check_trigger_both(s
 	writel(mask, reg);
 }
 
-static void jz_gpio_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
+static void jz_gpio_irq_demux_handler(unsigned int __irq,
+				      struct irq_desc *desc)
 {
 	uint32_t flag;
 	unsigned int gpio_irq;
--- /var/linuxes/linux-next/arch/mips/kernel/i8259.c	2015-06-11 07:18:48.010399428 +0200
+++ /var/julia/linuxcopy/arch/mips/kernel/i8259.c	2015-06-13 10:31:09.295543123 +0200
@@ -353,8 +353,9 @@ void __init init_i8259_irqs(void)
 	__init_i8259_irqs(NULL);
 }
 
-static void i8259_irq_dispatch(unsigned int irq, struct irq_desc *desc)
+static void i8259_irq_dispatch(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_domain *domain = irq_get_handler_data(irq);
 	int hwirq = i8259_irq();
 
--- /var/linuxes/linux-next/arch/mips/netlogic/common/smp.c	2015-03-29 18:14:16.636904317 +0200
+++ /var/julia/linuxcopy/arch/mips/netlogic/common/smp.c	2015-06-13 10:31:33.551542221 +0200
@@ -82,8 +82,9 @@ void nlm_send_ipi_mask(const struct cpum
 }
 
 /* IRQ_IPI_SMP_FUNCTION Handler */
-void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc)
+void nlm_smp_function_ipi_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	clear_c0_eimr(irq);
 	ack_c0_eirr(irq);
 	smp_call_function_interrupt();
@@ -91,8 +92,9 @@ void nlm_smp_function_ipi_handler(unsign
 }
 
 /* IRQ_IPI_SMP_RESCHEDULE  handler */
-void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc)
+void nlm_smp_resched_ipi_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	clear_c0_eimr(irq);
 	ack_c0_eirr(irq);
 	scheduler_ipi();
--- /var/linuxes/linux-next/arch/mips/pci/pci-ar2315.c	2015-06-11 07:18:48.046399427 +0200
+++ /var/julia/linuxcopy/arch/mips/pci/pci-ar2315.c	2015-06-13 10:31:11.075543057 +0200
@@ -318,7 +318,7 @@ static int ar2315_pci_host_setup(struct
 	return 0;
 }
 
-static void ar2315_pci_irq_handler(unsigned irq, struct irq_desc *desc)
+static void ar2315_pci_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
 	struct ar2315_pci_ctrl *apc = irq_desc_get_handler_data(desc);
 	u32 pending = ar2315_pci_reg_read(apc, AR2315_PCI_ISR) &
--- /var/linuxes/linux-next/arch/mips/pci/pci-ar71xx.c	2015-06-11 07:18:48.046399427 +0200
+++ /var/julia/linuxcopy/arch/mips/pci/pci-ar71xx.c	2015-06-13 10:31:10.599543075 +0200
@@ -226,7 +226,7 @@ static struct pci_ops ar71xx_pci_ops = {
 	.write	= ar71xx_pci_write_config,
 };
 
-static void ar71xx_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ar71xx_pci_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	struct ar71xx_pci_controller *apc;
 	void __iomem *base = ath79_reset_base;
--- /var/linuxes/linux-next/arch/mips/pci/pci-ar724x.c	2015-06-11 07:18:48.046399427 +0200
+++ /var/julia/linuxcopy/arch/mips/pci/pci-ar724x.c	2015-06-13 10:31:10.375543083 +0200
@@ -225,7 +225,7 @@ static struct pci_ops ar724x_pci_ops = {
 	.write	= ar724x_pci_write,
 };
 
-static void ar724x_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ar724x_pci_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	struct ar724x_pci_controller *apc;
 	void __iomem *base;
--- /var/linuxes/linux-next/arch/mips/pci/pci-rt3883.c	2015-06-11 07:18:48.046399427 +0200
+++ /var/julia/linuxcopy/arch/mips/pci/pci-rt3883.c	2015-06-13 10:31:10.807543067 +0200
@@ -129,7 +129,7 @@ static void rt3883_pci_write_cfg32(struc
 	rt3883_pci_w32(rpc, val, RT3883_PCI_REG_CFGDATA);
 }
 
-static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void rt3883_pci_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	struct rt3883_pci_controller *rpc;
 	u32 pending;
--- /var/linuxes/linux-next/arch/mips/ralink/irq.c	2015-06-11 07:18:48.046399427 +0200
+++ /var/julia/linuxcopy/arch/mips/ralink/irq.c	2015-06-13 10:31:11.755543032 +0200
@@ -95,7 +95,7 @@ unsigned int get_c0_compare_int(void)
 	return CP0_LEGACY_COMPARE_IRQ;
 }
 
-static void ralink_intc_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ralink_intc_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	u32 pending = rt_intc_r32(INTC_REG_STATUS0);
 
--- /var/linuxes/linux-next/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c	2012-02-08 18:41:50.000000000 +0100
+++ /var/julia/linuxcopy/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c	2015-06-13 10:31:14.527542929 +0200
@@ -105,7 +105,7 @@ cpld_pic_get_irq(int offset, u8 ignore,
 }
 
 static void
-cpld_pic_cascade(unsigned int irq, struct irq_desc *desc)
+cpld_pic_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	irq = cpld_pic_get_irq(0, PCI_IGNORE, &cpld_regs->pci_status,
 		&cpld_regs->pci_mask);
--- /var/linuxes/linux-next/arch/powerpc/platforms/52xx/media5200.c	2014-09-28 16:59:48.497931452 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/52xx/media5200.c	2015-06-13 10:31:16.643542850 +0200
@@ -80,7 +80,7 @@ static struct irq_chip media5200_irq_chi
 	.irq_mask_ack = media5200_irq_mask,
 };
 
-void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
+void media5200_irq_cascade(unsigned int __virq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	int sub_virq, val;
--- /var/linuxes/linux-next/arch/powerpc/platforms/52xx/mpc52xx_gpt.c	2015-06-11 07:18:48.078399425 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/52xx/mpc52xx_gpt.c	2015-06-13 10:31:16.855542842 +0200
@@ -191,7 +191,7 @@ static struct irq_chip mpc52xx_gpt_irq_c
 	.irq_set_type = mpc52xx_gpt_irq_set_type,
 };
 
-void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc)
+void mpc52xx_gpt_irq_cascade(unsigned int __virq, struct irq_desc *desc)
 {
 	struct mpc52xx_gpt_priv *gpt = irq_desc_get_handler_data(desc);
 	int sub_virq;
--- /var/linuxes/linux-next/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c	2012-11-25 19:53:20.000000000 +0100
+++ /var/julia/linuxcopy/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c	2015-06-13 10:31:14.127542944 +0200
@@ -78,7 +78,7 @@ static struct irq_chip pq2ads_pci_ic = {
 	.irq_disable = pq2ads_pci_mask_irq
 };
 
-static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void pq2ads_pci_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
 	struct pq2ads_pci_pic *priv = irq_desc_get_handler_data(desc);
 	u32 stat, mask, pend;
--- /var/linuxes/linux-next/arch/powerpc/platforms/85xx/common.c	2015-04-09 16:05:25.817843115 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/85xx/common.c	2015-06-13 10:31:15.819542881 +0200
@@ -49,7 +49,7 @@ int __init mpc85xx_common_publish_device
 	return of_platform_bus_probe(NULL, mpc85xx_common_ids, NULL);
 }
 #ifdef CONFIG_CPM2
-static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
+static void cpm2_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	int cascade_irq;
--- /var/linuxes/linux-next/arch/powerpc/platforms/85xx/mpc85xx_cds.c	2014-03-26 18:13:37.798022642 +0100
+++ /var/julia/linuxcopy/arch/powerpc/platforms/85xx/mpc85xx_cds.c	2015-06-13 10:31:15.407542896 +0200
@@ -192,9 +192,10 @@ void mpc85xx_cds_fixup_bus(struct pci_bu
 }
 
 #ifdef CONFIG_PPC_I8259
-static void mpc85xx_8259_cascade_handler(unsigned int irq,
+static void mpc85xx_8259_cascade_handler(unsigned int __irq,
 					 struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	unsigned int cascade_irq = i8259_irq();
 
 	if (cascade_irq != NO_IRQ)
--- /var/linuxes/linux-next/arch/powerpc/platforms/85xx/mpc85xx_ds.c	2014-03-26 18:13:37.798022642 +0100
+++ /var/julia/linuxcopy/arch/powerpc/platforms/85xx/mpc85xx_ds.c	2015-06-13 10:31:15.191542904 +0200
@@ -46,7 +46,7 @@
 #endif
 
 #ifdef CONFIG_PPC_I8259
-static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void mpc85xx_8259_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq = i8259_irq();
--- /var/linuxes/linux-next/arch/powerpc/platforms/85xx/socrates_fpga_pic.c	2013-10-31 21:45:24.000000000 +0100
+++ /var/julia/linuxcopy/arch/powerpc/platforms/85xx/socrates_fpga_pic.c	2015-06-13 10:31:15.631542888 +0200
@@ -91,8 +91,9 @@ static inline unsigned int socrates_fpga
 			(irq_hw_number_t)i);
 }
 
-void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
+void socrates_fpga_pic_cascade(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq;
 
--- /var/linuxes/linux-next/arch/powerpc/platforms/86xx/pic.c	2013-10-31 21:45:24.000000000 +0100
+++ /var/julia/linuxcopy/arch/powerpc/platforms/86xx/pic.c	2015-06-13 10:31:14.991542912 +0200
@@ -17,7 +17,7 @@
 #include <asm/i8259.h>
 
 #ifdef CONFIG_PPC_I8259
-static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void mpc86xx_8259_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq = i8259_irq();
--- /var/linuxes/linux-next/arch/powerpc/platforms/8xx/m8xx_setup.c	2014-06-28 20:09:11.313152825 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/8xx/m8xx_setup.c	2015-06-13 10:31:14.323542936 +0200
@@ -214,7 +214,7 @@ void mpc8xx_restart(char *cmd)
 	panic("Restart failed\n");
 }
 
-static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
+static void cpm_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	int cascade_irq = cpm_get_irq();
--- /var/linuxes/linux-next/arch/powerpc/platforms/cell/axon_msi.c	2015-06-11 07:18:48.078399425 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/cell/axon_msi.c	2015-06-13 10:31:13.463542968 +0200
@@ -93,7 +93,7 @@ static void msic_dcr_write(struct axon_m
 	dcr_write(msic->dcr_host, dcr_n, val);
 }
 
-static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
+static void axon_msi_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct axon_msic *msic = irq_desc_get_handler_data(desc);
--- /var/linuxes/linux-next/arch/powerpc/platforms/cell/interrupt.c	2015-04-11 07:10:38.244609522 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/cell/interrupt.c	2015-06-13 10:31:13.919542951 +0200
@@ -99,8 +99,9 @@ static void iic_ioexc_eoi(struct irq_dat
 {
 }
 
-static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc)
+static void iic_ioexc_cascade(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct cbe_iic_regs __iomem *node_iic =
 		(void __iomem *)irq_desc_get_handler_data(desc);
--- /var/linuxes/linux-next/arch/powerpc/platforms/cell/spider-pic.c	2013-10-31 21:45:24.000000000 +0100
+++ /var/julia/linuxcopy/arch/powerpc/platforms/cell/spider-pic.c	2015-06-13 10:31:13.679542960 +0200
@@ -199,7 +199,7 @@ static const struct irq_domain_ops spide
 	.xlate = spider_host_xlate,
 };
 
-static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc)
+static void spider_irq_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct spider_pic *pic = irq_desc_get_handler_data(desc);
--- /var/linuxes/linux-next/arch/powerpc/platforms/chrp/setup.c	2015-04-09 16:05:25.817843115 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/chrp/setup.c	2015-06-13 10:31:16.487542856 +0200
@@ -363,7 +363,7 @@ void __init chrp_setup_arch(void)
 	if (ppc_md.progress) ppc_md.progress("Linux/PPC "UTS_RELEASE"\n", 0x0);
 }
 
-static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void chrp_8259_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq = i8259_irq();
--- /var/linuxes/linux-next/arch/powerpc/platforms/embedded6xx/hlwd-pic.c	2015-06-11 07:18:48.078399425 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/embedded6xx/hlwd-pic.c	2015-06-13 10:31:16.215542866 +0200
@@ -120,7 +120,7 @@ static unsigned int __hlwd_pic_get_irq(s
 	return irq_linear_revmap(h, irq);
 }
 
-static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
+static void hlwd_pic_irq_cascade(unsigned int __cascade_virq,
 				      struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
--- /var/linuxes/linux-next/arch/powerpc/platforms/embedded6xx/mvme5100.c	2014-09-28 16:59:48.501931452 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/embedded6xx/mvme5100.c	2015-06-13 10:31:16.011542874 +0200
@@ -42,7 +42,7 @@
 static phys_addr_t pci_membase;
 static u_char *restart;
 
-static void mvme5100_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void mvme5100_8259_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq = i8259_irq();
--- /var/linuxes/linux-next/arch/powerpc/platforms/pseries/setup.c	2015-04-15 21:00:15.397904047 +0200
+++ /var/julia/linuxcopy/arch/powerpc/platforms/pseries/setup.c	2015-06-13 10:31:14.803542919 +0200
@@ -111,7 +111,7 @@ static void __init fwnmi_init(void)
 		fwnmi_active = 1;
 }
 
-static void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void pseries_8259_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq = i8259_irq();
--- /var/linuxes/linux-next/arch/powerpc/sysdev/ge/ge_pic.c	2012-03-24 22:42:59.000000000 +0100
+++ /var/julia/linuxcopy/arch/powerpc/sysdev/ge/ge_pic.c	2015-06-13 10:31:13.071542983 +0200
@@ -91,7 +91,7 @@ static int gef_pic_cascade_irq;
  * should be masked out.
  */
 
-void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
+void gef_pic_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq;
--- /var/linuxes/linux-next/arch/powerpc/sysdev/tsi108_pci.c	2015-05-25 16:03:31.087858330 +0200
+++ /var/julia/linuxcopy/arch/powerpc/sysdev/tsi108_pci.c	2015-06-13 10:31:34.607542182 +0200
@@ -428,7 +428,7 @@ void __init tsi108_pci_int_init(struct d
 	init_pci_source();
 }
 
-void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc)
+void tsi108_irq_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq = get_pci_source();
--- /var/linuxes/linux-next/arch/powerpc/sysdev/uic.c	2015-06-11 07:18:48.082399425 +0200
+++ /var/julia/linuxcopy/arch/powerpc/sysdev/uic.c	2015-06-13 10:31:13.279542975 +0200
@@ -194,7 +194,7 @@ static const struct irq_domain_ops uic_h
 	.xlate	= irq_domain_xlate_twocell,
 };
 
-void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)
+void uic_irq_cascade(unsigned int __virq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct irq_data *idata = irq_desc_get_irq_data(desc);
--- /var/linuxes/linux-next/arch/powerpc/sysdev/xilinx_intc.c	2015-05-25 16:03:31.087858330 +0200
+++ /var/julia/linuxcopy/arch/powerpc/sysdev/xilinx_intc.c	2015-06-13 10:31:12.835542992 +0200
@@ -222,7 +222,7 @@ int xilinx_intc_get_irq(void)
 /*
  * Support code for cascading to 8259 interrupt controllers
  */
-static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void xilinx_i8259_cascade(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq = i8259_irq();
--- /var/linuxes/linux-next/arch/sh/boards/mach-se/7343/irq.c	2015-02-09 14:08:00.979569021 +0100
+++ /var/julia/linuxcopy/arch/sh/boards/mach-se/7343/irq.c	2015-06-13 10:31:04.011543320 +0200
@@ -29,8 +29,9 @@
 static void __iomem *se7343_irq_regs;
 struct irq_domain *se7343_irq_domain;
 
-static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void se7343_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_data *data = irq_get_irq_data(irq);
 	struct irq_chip *chip = irq_data_get_irq_chip(data);
 	unsigned long mask;
--- /var/linuxes/linux-next/arch/sh/boards/mach-se/7722/irq.c	2015-02-09 14:08:00.979569021 +0100
+++ /var/julia/linuxcopy/arch/sh/boards/mach-se/7722/irq.c	2015-06-13 10:31:04.143543315 +0200
@@ -28,8 +28,9 @@
 static void __iomem *se7722_irq_regs;
 struct irq_domain *se7722_irq_domain;
 
-static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void se7722_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_data *data = irq_get_irq_data(irq);
 	struct irq_chip *chip = irq_data_get_irq_chip(data);
 	unsigned long mask;
--- /var/linuxes/linux-next/arch/sh/boards/mach-se/7724/irq.c	2012-06-03 21:09:49.000000000 +0200
+++ /var/julia/linuxcopy/arch/sh/boards/mach-se/7724/irq.c	2015-06-13 10:31:03.867543325 +0200
@@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip _
 	.irq_unmask	= enable_se7724_irq,
 };
 
-static void se7724_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void se7724_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct fpga_irq set = get_fpga_irq(irq);
 	unsigned short intv = __raw_readw(set.sraddr);
 	unsigned int ext_irq = set.base;
--- /var/linuxes/linux-next/arch/sh/boards/mach-x3proto/gpio.c	2014-09-28 16:59:48.513931451 +0200
+++ /var/julia/linuxcopy/arch/sh/boards/mach-x3proto/gpio.c	2015-06-13 10:31:04.275543310 +0200
@@ -60,8 +60,10 @@ static int x3proto_gpio_to_irq(struct gp
 	return virq;
 }
 
-static void x3proto_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void x3proto_gpio_irq_handler(unsigned int __irq,
+				     struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_data *data = irq_get_irq_data(irq);
 	struct irq_chip *chip = irq_data_get_irq_chip(data);
 	unsigned long mask;
--- /var/linuxes/linux-next/arch/sh/cchips/hd6446x/hd64461.c	2012-06-03 21:09:49.000000000 +0200
+++ /var/julia/linuxcopy/arch/sh/cchips/hd6446x/hd64461.c	2015-06-13 10:31:04.411543305 +0200
@@ -56,7 +56,7 @@ static struct irq_chip hd64461_irq_chip
 	.irq_unmask	= hd64461_unmask_irq,
 };
 
-static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void hd64461_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned short intv = __raw_readw(HD64461_NIRR);
 	unsigned int ext_irq = HD64461_IRQBASE;
--- /var/linuxes/linux-next/arch/tile/kernel/pci_gx.c	2015-03-29 18:14:16.680904316 +0200
+++ /var/julia/linuxcopy/arch/tile/kernel/pci_gx.c	2015-06-13 10:31:06.871543214 +0200
@@ -304,8 +304,9 @@ static struct irq_chip tilegx_legacy_irq
  * to Linux which just calls handle_level_irq() after clearing the
  * MAC INTx Assert status bit associated with this interrupt.
  */
-static void trio_handle_level_irq(unsigned int irq, struct irq_desc *desc)
+static void trio_handle_level_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct pci_controller *controller = irq_desc_get_handler_data(desc);
 	gxio_trio_context_t *trio_context = controller->trio;
 	uint64_t intx = (uint64_t)irq_desc_get_chip_data(desc);
--- /var/linuxes/linux-next/arch/unicore32/kernel/irq.c	2012-04-02 16:20:04.000000000 +0200
+++ /var/julia/linuxcopy/arch/unicore32/kernel/irq.c	2015-06-13 10:31:11.923543026 +0200
@@ -113,7 +113,7 @@ static struct irq_chip puv3_low_gpio_chi
  * and call the handler.
  */
 static void
-puv3_gpio_handler(unsigned int irq, struct irq_desc *desc)
+puv3_gpio_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 
--- /var/linuxes/linux-next/arch/x86/lguest/boot.c	2015-05-26 21:47:09.119877951 +0200
+++ /var/julia/linuxcopy/arch/x86/lguest/boot.c	2015-06-13 10:31:23.767542585 +0200
@@ -1021,7 +1021,7 @@ static struct clock_event_device lguest_
  * This is the Guest timer interrupt handler (hardware interrupt 0).  We just
  * call the clockevent infrastructure and it does whatever needs doing.
  */
-static void lguest_time_irq(unsigned int irq, struct irq_desc *desc)
+static void lguest_time_irq(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long flags;
 
--- /var/linuxes/linux-next/drivers/dma/ipu/ipu_irq.c	2013-09-23 19:01:31.000000000 +0200
+++ /var/julia/linuxcopy/drivers/dma/ipu/ipu_irq.c	2015-06-13 10:30:47.743543925 +0200
@@ -266,8 +266,9 @@ int ipu_irq_unmap(unsigned int source)
 }
 
 /* Chained IRQ handler for IPU error interrupt */
-static void ipu_irq_err(unsigned int irq, struct irq_desc *desc)
+static void ipu_irq_err(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct ipu *ipu = irq_get_handler_data(irq);
 	u32 status;
 	int i, line;
@@ -307,8 +308,9 @@ static void ipu_irq_err(unsigned int irq
 }
 
 /* Chained IRQ handler for IPU function interrupt */
-static void ipu_irq_fn(unsigned int irq, struct irq_desc *desc)
+static void ipu_irq_fn(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct ipu *ipu = irq_desc_get_handler_data(desc);
 	u32 status;
 	int i, line;
--- /var/linuxes/linux-next/drivers/gpio/gpio-bcm-kona.c	2015-05-25 16:03:31.299858322 +0200
+++ /var/julia/linuxcopy/drivers/gpio/gpio-bcm-kona.c	2015-06-13 10:30:53.735543702 +0200
@@ -433,8 +433,10 @@ static int bcm_kona_gpio_irq_set_type(st
 	return 0;
 }
 
-static void bcm_kona_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void bcm_kona_gpio_irq_handler(unsigned int __irq,
+				      struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	void __iomem *reg_base;
 	int bit, bank_id;
 	unsigned long sta;
--- /var/linuxes/linux-next/drivers/gpio/gpio-davinci.c	2014-11-18 14:02:58.318302579 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-davinci.c	2015-06-13 10:30:54.303543681 +0200
@@ -327,8 +327,9 @@ static struct irq_chip gpio_irqchip = {
 };
 
 static void
-gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+gpio_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct davinci_gpio_regs __iomem *g;
 	u32 mask = 0xffff;
 	struct davinci_gpio_controller *d;
--- /var/linuxes/linux-next/drivers/gpio/gpio-dwapb.c	2015-01-27 11:54:45.205642194 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-dwapb.c	2015-06-13 10:30:56.091543614 +0200
@@ -147,8 +147,9 @@ static u32 dwapb_do_irq(struct dwapb_gpi
 	return ret;
 }
 
-static void dwapb_irq_handler(u32 irq, struct irq_desc *desc)
+static void dwapb_irq_handler(u32 __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct dwapb_gpio *gpio = irq_get_handler_data(irq);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 
--- /var/linuxes/linux-next/drivers/gpio/gpio-ep93xx.c	2014-11-16 10:01:31.001268457 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-ep93xx.c	2015-06-13 10:30:54.099543689 +0200
@@ -78,7 +78,8 @@ static void ep93xx_gpio_int_debounce(uns
 		EP93XX_GPIO_REG(int_debounce_register_offset[port]));
 }
 
-static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ep93xx_gpio_ab_irq_handler(unsigned int __irq,
+				       struct irq_desc *desc)
 {
 	unsigned char status;
 	int i;
@@ -100,8 +101,10 @@ static void ep93xx_gpio_ab_irq_handler(u
 	}
 }
 
-static void ep93xx_gpio_f_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ep93xx_gpio_f_irq_handler(unsigned int __irq,
+				      struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	/*
 	 * map discontiguous hw irq range to continuous sw irq range:
 	 *
--- /var/linuxes/linux-next/drivers/gpio/gpio-mpc8xxx.c	2015-05-25 16:03:31.303858322 +0200
+++ /var/julia/linuxcopy/drivers/gpio/gpio-mpc8xxx.c	2015-06-13 10:30:56.275543608 +0200
@@ -185,7 +185,8 @@ static int mpc8xxx_gpio_to_irq(struct gp
 		return -ENXIO;
 }
 
-static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc)
+static void mpc8xxx_gpio_irq_cascade(unsigned int __irq,
+				     struct irq_desc *desc)
 {
 	struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
--- /var/linuxes/linux-next/drivers/gpio/gpio-msic.c	2014-11-16 10:01:31.001268457 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-msic.c	2015-06-13 10:30:55.387543641 +0200
@@ -232,7 +232,7 @@ static struct irq_chip msic_irqchip = {
 	.irq_bus_sync_unlock	= msic_bus_sync_unlock,
 };
 
-static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+static void msic_gpio_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
 	struct irq_data *data = irq_desc_get_irq_data(desc);
 	struct msic_gpio *mg = irq_data_get_irq_handler_data(data);
--- /var/linuxes/linux-next/drivers/gpio/gpio-msm-v2.c	2014-11-16 10:01:31.001268457 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-msm-v2.c	2015-06-13 10:30:54.983543656 +0200
@@ -313,7 +313,7 @@ static int msm_gpio_irq_set_type(struct
  * which have been set as summary IRQ lines and which are triggered,
  * and to call their interrupt handlers.
  */
-static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void msm_summary_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned long i;
 	struct irq_chip *chip = irq_desc_get_chip(desc);
--- /var/linuxes/linux-next/drivers/gpio/gpio-mvebu.c	2015-04-11 07:10:38.248609522 +0200
+++ /var/julia/linuxcopy/drivers/gpio/gpio-mvebu.c	2015-06-13 10:30:55.647543631 +0200
@@ -458,8 +458,9 @@ static int mvebu_gpio_irq_set_type(struc
 	return 0;
 }
 
-static void mvebu_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void mvebu_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct mvebu_gpio_chip *mvchip = irq_get_handler_data(irq);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	u32 cause, type;
--- /var/linuxes/linux-next/drivers/gpio/gpio-mxc.c	2015-05-25 16:03:31.303858322 +0200
+++ /var/julia/linuxcopy/drivers/gpio/gpio-mxc.c	2015-06-13 10:30:56.659543593 +0200
@@ -272,8 +272,9 @@ static void mxc_gpio_irq_handler(struct
 }
 
 /* MX1 and MX3 has one interrupt *per* gpio port */
-static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc)
+static void mx3_gpio_irq_handler(u32 __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	u32 irq_stat;
 	struct mxc_gpio_port *port = irq_get_handler_data(irq);
 	struct irq_chip *chip = irq_get_chip(irq);
@@ -288,8 +289,9 @@ static void mx3_gpio_irq_handler(u32 irq
 }
 
 /* MX2 has one interrupt *for all* gpio ports */
-static void mx2_gpio_irq_handler(u32 irq, struct irq_desc *desc)
+static void mx2_gpio_irq_handler(u32 __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	u32 irq_msk, irq_stat;
 	struct mxc_gpio_port *port;
 	struct irq_chip *chip = irq_get_chip(irq);
--- /var/linuxes/linux-next/drivers/gpio/gpio-mxs.c	2015-05-25 16:03:31.303858322 +0200
+++ /var/julia/linuxcopy/drivers/gpio/gpio-mxs.c	2015-06-13 10:30:54.803543662 +0200
@@ -154,8 +154,9 @@ static void mxs_flip_edge(struct mxs_gpi
 }
 
 /* MXS has one interrupt *per* gpio port */
-static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc)
+static void mxs_gpio_irq_handler(u32 __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	u32 irq_stat;
 	struct mxs_gpio_port *port = irq_get_handler_data(irq);
 
--- /var/linuxes/linux-next/drivers/gpio/gpio-pxa.c	2015-03-12 22:23:12.134844786 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-pxa.c	2015-06-13 10:30:55.215543647 +0200
@@ -401,7 +401,7 @@ static int pxa_gpio_irq_type(struct irq_
 	return 0;
 }
 
-static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
+static void pxa_gpio_demux_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	struct pxa_gpio_chip *c;
 	int loop, gpio, gpio_base, n;
--- /var/linuxes/linux-next/drivers/gpio/gpio-sa1100.c	2015-05-25 16:03:31.303858322 +0200
+++ /var/julia/linuxcopy/drivers/gpio/gpio-sa1100.c	2015-06-13 10:30:54.631543669 +0200
@@ -173,7 +173,7 @@ static struct irq_domain *sa1100_gpio_ir
  * and call the handler.
  */
 static void
-sa1100_gpio_handler(unsigned int irq, struct irq_desc *desc)
+sa1100_gpio_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	unsigned int mask;
 
--- /var/linuxes/linux-next/drivers/gpio/gpio-tegra.c	2015-06-11 07:18:48.246399419 +0200
+++ /var/julia/linuxcopy/drivers/gpio/gpio-tegra.c	2015-06-13 10:30:56.879543585 +0200
@@ -266,8 +266,9 @@ static void tegra_gpio_irq_shutdown(stru
 	gpiochip_unlock_as_irq(&tegra_gpio_chip, gpio);
 }
 
-static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void tegra_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct tegra_gpio_bank *bank;
 	int port;
 	int pin;
--- /var/linuxes/linux-next/drivers/gpio/gpio-timberdale.c	2014-11-16 10:01:31.005268457 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-timberdale.c	2015-06-13 10:30:54.479543674 +0200
@@ -192,8 +192,9 @@ out:
 	return ret;
 }
 
-static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
+static void timbgpio_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct timbgpio *tgpio = irq_get_handler_data(irq);
 	unsigned long ipr;
 	int offset;
--- /var/linuxes/linux-next/drivers/gpio/gpio-tz1090.c	2015-01-27 11:54:45.209642194 +0100
+++ /var/julia/linuxcopy/drivers/gpio/gpio-tz1090.c	2015-06-13 10:30:55.855543623 +0200
@@ -375,7 +375,7 @@ static int gpio_set_irq_wake(struct irq_
 #define gpio_set_irq_wake NULL
 #endif
 
-static void tz1090_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void tz1090_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	irq_hw_number_t hw;
 	unsigned int irq_stat, irq_no;
--- /var/linuxes/linux-next/drivers/gpu/ipu-v3/ipu-common.c	2015-03-03 13:07:04.749007532 +0100
+++ /var/julia/linuxcopy/drivers/gpu/ipu-v3/ipu-common.c	2015-06-13 10:30:53.139543724 +0200
@@ -912,8 +912,9 @@ static void ipu_irq_handle(struct ipu_so
 	}
 }
 
-static void ipu_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ipu_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct ipu_soc *ipu = irq_desc_get_handler_data(desc);
 	const int int_reg[] = { 0, 1, 2, 3, 10, 11, 12, 13, 14};
 	struct irq_chip *chip = irq_get_chip(irq);
@@ -925,8 +926,9 @@ static void ipu_irq_handler(unsigned int
 	chained_irq_exit(chip, desc);
 }
 
-static void ipu_err_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ipu_err_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct ipu_soc *ipu = irq_desc_get_handler_data(desc);
 	const int int_reg[] = { 4, 5, 8, 9};
 	struct irq_chip *chip = irq_get_chip(irq);
--- /var/linuxes/linux-next/drivers/irqchip/exynos-combiner.c	2015-05-25 16:03:31.435858317 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/exynos-combiner.c	2015-06-13 10:31:02.671543370 +0200
@@ -60,8 +60,10 @@ static void combiner_unmask_irq(struct i
 	__raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET);
 }
 
-static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
+static void combiner_handle_cascade_irq(unsigned int __irq,
+					struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct combiner_chip_data *chip_data = irq_get_handler_data(irq);
 	struct irq_chip *chip = irq_get_chip(irq);
 	unsigned int cascade_irq, combiner_irq;
--- /var/linuxes/linux-next/drivers/irqchip/irq-armada-370-xp.c	2015-05-25 16:03:31.435858317 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-armada-370-xp.c	2015-06-13 10:31:00.127543464 +0200
@@ -448,9 +448,10 @@ static void armada_370_xp_handle_msi_irq
 static void armada_370_xp_handle_msi_irq(struct pt_regs *r, bool b) {}
 #endif
 
-static void armada_370_xp_mpic_handle_cascade_irq(unsigned int irq,
+static void armada_370_xp_mpic_handle_cascade_irq(unsigned int __irq,
 						  struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	unsigned long irqmap, irqn, irqsrc, cpuid;
 	unsigned int cascade_irq;
--- /var/linuxes/linux-next/drivers/irqchip/irq-bcm7038-l1.c	2015-03-29 18:14:16.868904309 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-bcm7038-l1.c	2015-06-13 10:31:01.499543413 +0200
@@ -116,7 +116,7 @@ static inline void l1_writel(u32 val, vo
 		writel(val, reg);
 }
 
-static void bcm7038_l1_irq_handle(unsigned int irq, struct irq_desc *desc)
+static void bcm7038_l1_irq_handle(unsigned int __irq, struct irq_desc *desc)
 {
 	struct bcm7038_l1_chip *intc = irq_desc_get_handler_data(desc);
 	struct bcm7038_l1_cpu *cpu;
--- /var/linuxes/linux-next/drivers/irqchip/irq-bcm7120-l2.c	2015-03-29 18:14:16.868904309 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-bcm7120-l2.c	2015-06-13 10:30:59.919543472 +0200
@@ -52,7 +52,8 @@ struct bcm7120_l2_intc_data {
 	const __be32 *map_mask_prop;
 };
 
-static void bcm7120_l2_intc_irq_handle(unsigned int irq, struct irq_desc *desc)
+static void bcm7120_l2_intc_irq_handle(unsigned int __irq,
+				       struct irq_desc *desc)
 {
 	struct bcm7120_l2_intc_data *b = irq_desc_get_handler_data(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
--- /var/linuxes/linux-next/drivers/irqchip/irq-brcmstb-l2.c	2015-03-29 18:14:16.868904309 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-brcmstb-l2.c	2015-06-13 10:30:59.539543486 +0200
@@ -51,8 +51,10 @@ struct brcmstb_l2_intc_data {
 	u32 saved_mask; /* for suspend/resume */
 };
 
-static void brcmstb_l2_intc_irq_handle(unsigned int irq, struct irq_desc *desc)
+static void brcmstb_l2_intc_irq_handle(unsigned int __irq,
+				       struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct brcmstb_l2_intc_data *b = irq_desc_get_handler_data(desc);
 	struct irq_chip_generic *gc = irq_get_domain_generic_chip(b->domain, 0);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
--- /var/linuxes/linux-next/drivers/irqchip/irq-dw-apb-ictl.c	2014-11-29 15:47:36.790720322 +0100
+++ /var/julia/linuxcopy/drivers/irqchip/irq-dw-apb-ictl.c	2015-06-13 10:31:00.671543444 +0200
@@ -26,8 +26,9 @@
 #define APB_INT_FINALSTATUS_L	0x30
 #define APB_INT_FINALSTATUS_H	0x34
 
-static void dw_apb_ictl_handler(unsigned int irq, struct irq_desc *desc)
+static void dw_apb_ictl_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	struct irq_chip_generic *gc = irq_get_handler_data(irq);
 	struct irq_domain *d = gc->private;
--- /var/linuxes/linux-next/drivers/irqchip/irq-gic.c	2015-06-11 07:18:48.530399409 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-gic.c	2015-06-13 10:31:03.715543331 +0200
@@ -286,8 +286,9 @@ static void __exception_irq_entry gic_ha
 	} while (1);
 }
 
-static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
+static void gic_handle_cascade_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct gic_chip_data *chip_data = irq_get_handler_data(irq);
 	struct irq_chip *chip = irq_get_chip(irq);
 	unsigned int cascade_irq, gic_irq;
--- /var/linuxes/linux-next/drivers/irqchip/irq-imgpdc.c	2013-08-24 13:44:34.000000000 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-imgpdc.c	2015-06-13 10:31:03.407543342 +0200
@@ -218,8 +218,9 @@ static int pdc_irq_set_wake(struct irq_d
 	return 0;
 }
 
-static void pdc_intc_perip_isr(unsigned int irq, struct irq_desc *desc)
+static void pdc_intc_perip_isr(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct pdc_intc_priv *priv;
 	unsigned int i, irq_no;
 
@@ -239,7 +240,7 @@ found:
 	generic_handle_irq(irq_no);
 }
 
-static void pdc_intc_syswake_isr(unsigned int irq, struct irq_desc *desc)
+static void pdc_intc_syswake_isr(unsigned int __irq, struct irq_desc *desc)
 {
 	struct pdc_intc_priv *priv;
 	unsigned int syswake, irq_no;
--- /var/linuxes/linux-next/drivers/irqchip/irq-keystone.c	2015-05-25 16:03:31.435858317 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-keystone.c	2015-06-13 10:31:01.335543419 +0200
@@ -84,8 +84,9 @@ static void keystone_irq_ack(struct irq_
 	/* nothing to do here */
 }
 
-static void keystone_irq_handler(unsigned irq, struct irq_desc *desc)
+static void keystone_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct keystone_irq_device *kirq = irq_desc_get_handler_data(desc);
 	unsigned long pending;
 	int src, virq;
--- /var/linuxes/linux-next/drivers/irqchip/irq-metag.c	2014-02-28 08:06:01.586441457 +0100
+++ /var/julia/linuxcopy/drivers/irqchip/irq-metag.c	2015-06-13 10:31:02.511543376 +0200
@@ -220,7 +220,8 @@ static int metag_internal_irq_set_affini
  *	occurred. It is this function's job to demux this irq and
  *	figure out exactly which trigger needs servicing.
  */
-static void metag_internal_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void metag_internal_irq_demux(unsigned int __irq,
+				     struct irq_desc *desc)
 {
 	struct metag_internal_irq_priv *priv = irq_desc_get_handler_data(desc);
 	irq_hw_number_t hw;
--- /var/linuxes/linux-next/drivers/irqchip/irq-metag-ext.c	2014-02-28 08:06:01.586441457 +0100
+++ /var/julia/linuxcopy/drivers/irqchip/irq-metag-ext.c	2015-06-13 10:31:00.519543450 +0200
@@ -447,7 +447,7 @@ static int meta_intc_irq_set_type(struct
  * Whilst using TR2 to detect external interrupts is a software convention it is
  * (hopefully) unlikely to change.
  */
-static void meta_intc_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void meta_intc_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
 	struct meta_intc_priv *priv = &meta_intc_priv;
 	irq_hw_number_t hw;
--- /var/linuxes/linux-next/drivers/irqchip/irq-mips-gic.c	2015-05-25 16:03:31.435858317 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-mips-gic.c	2015-06-13 10:31:00.907543435 +0200
@@ -513,7 +513,7 @@ static void __gic_irq_dispatch(void)
 	gic_handle_shared_int();
 }
 
-static void gic_irq_dispatch(unsigned int irq, struct irq_desc *desc)
+static void gic_irq_dispatch(unsigned int __irq, struct irq_desc *desc)
 {
 	__gic_irq_dispatch();
 }
--- /var/linuxes/linux-next/drivers/irqchip/irq-mmp.c	2014-09-09 13:39:34.643435202 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-mmp.c	2015-06-13 10:31:02.939543360 +0200
@@ -130,8 +130,9 @@ struct irq_chip icu_irq_chip = {
 	.irq_unmask	= icu_unmask_irq,
 };
 
-static void icu_mux_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void icu_mux_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_domain *domain;
 	struct icu_chip_data *data;
 	int i;
--- /var/linuxes/linux-next/drivers/irqchip/irq-orion.c	2014-09-09 13:39:34.643435202 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-orion.c	2015-06-13 10:31:01.799543402 +0200
@@ -107,8 +107,10 @@ IRQCHIP_DECLARE(orion_intc, "marvell,ori
 #define ORION_BRIDGE_IRQ_CAUSE	0x00
 #define ORION_BRIDGE_IRQ_MASK	0x04
 
-static void orion_bridge_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void orion_bridge_irq_handler(unsigned int __irq,
+				     struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_domain *d = irq_get_handler_data(irq);
 
 	struct irq_chip_generic *gc = irq_get_domain_generic_chip(d, 0);
--- /var/linuxes/linux-next/drivers/irqchip/irq-s3c24xx.c	2015-05-25 16:03:31.439858317 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-s3c24xx.c	2015-06-13 10:31:02.191543388 +0200
@@ -299,7 +299,7 @@ static struct irq_chip s3c_irq_eint0t4 =
 	.irq_set_type	= s3c_irqext0_type,
 };
 
-static void s3c_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void s3c_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct s3c_irq_data *irq_data = irq_desc_get_chip_data(desc);
--- /var/linuxes/linux-next/drivers/irqchip/irq-sunxi-nmi.c	2015-06-11 07:18:48.530399409 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-sunxi-nmi.c	2015-06-13 10:31:01.107543428 +0200
@@ -58,8 +58,9 @@ static inline u32 sunxi_sc_nmi_read(stru
 	return irq_reg_readl(gc, off);
 }
 
-static void sunxi_sc_nmi_handle_irq(unsigned int irq, struct irq_desc *desc)
+static void sunxi_sc_nmi_handle_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_domain *domain = irq_desc_get_handler_data(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	unsigned int virq = irq_find_mapping(domain, 0);
--- /var/linuxes/linux-next/drivers/irqchip/irq-tb10x.c	2014-11-16 10:01:31.085268454 +0100
+++ /var/julia/linuxcopy/drivers/irqchip/irq-tb10x.c	2015-06-13 10:31:01.647543408 +0200
@@ -97,8 +97,9 @@ static int tb10x_irq_set_type(struct irq
 	return IRQ_SET_MASK_OK;
 }
 
-static void tb10x_irq_cascade(unsigned int irq, struct irq_desc *desc)
+static void tb10x_irq_cascade(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_domain *domain = irq_desc_get_handler_data(desc);
 
 	generic_handle_irq(irq_find_mapping(domain, irq));
--- /var/linuxes/linux-next/drivers/irqchip/irq-versatile-fpga.c	2015-05-25 16:03:31.439858317 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-versatile-fpga.c	2015-06-13 10:31:02.359543381 +0200
@@ -66,8 +66,9 @@ static void fpga_irq_unmask(struct irq_d
 	writel(mask, f->base + IRQ_ENABLE_SET);
 }
 
-static void fpga_irq_handle(unsigned int irq, struct irq_desc *desc)
+static void fpga_irq_handle(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct fpga_irq_data *f = irq_desc_get_handler_data(desc);
 	u32 status = readl(f->base + IRQ_STATUS);
 
--- /var/linuxes/linux-next/drivers/irqchip/irq-vic.c	2015-05-25 16:03:31.439858317 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/irq-vic.c	2015-06-13 10:31:00.319543457 +0200
@@ -226,7 +226,7 @@ static int handle_one_vic(struct vic_dev
 	return handled;
 }
 
-static void vic_handle_irq_cascaded(unsigned int irq, struct irq_desc *desc)
+static void vic_handle_irq_cascaded(unsigned int __irq, struct irq_desc *desc)
 {
 	u32 stat, hwirq;
 	struct irq_chip *host_chip = irq_desc_get_chip(desc);
--- /var/linuxes/linux-next/drivers/irqchip/spear-shirq.c	2014-07-03 11:45:53.138208393 +0200
+++ /var/julia/linuxcopy/drivers/irqchip/spear-shirq.c	2015-06-13 10:30:59.747543478 +0200
@@ -183,8 +183,9 @@ static struct spear_shirq *spear320_shir
 	&spear320_shirq_intrcomm_ras,
 };
 
-static void shirq_handler(unsigned irq, struct irq_desc *desc)
+static void shirq_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct spear_shirq *shirq = irq_get_handler_data(irq);
 	u32 pend;
 
--- /var/linuxes/linux-next/drivers/mfd/asic3.c	2014-09-28 16:59:48.777931441 +0200
+++ /var/julia/linuxcopy/drivers/mfd/asic3.c	2015-06-13 10:30:58.751543516 +0200
@@ -138,7 +138,7 @@ static void asic3_irq_flip_edge(struct a
 	spin_unlock_irqrestore(&asic->lock, flags);
 }
 
-static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void asic3_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
 	struct asic3 *asic = irq_desc_get_handler_data(desc);
 	struct irq_data *data = irq_desc_get_irq_data(desc);
--- /var/linuxes/linux-next/drivers/mfd/ezx-pcap.c	2014-07-29 09:46:18.518923678 +0200
+++ /var/julia/linuxcopy/drivers/mfd/ezx-pcap.c	2015-06-13 10:30:58.099543540 +0200
@@ -205,8 +205,9 @@ static void pcap_isr_work(struct work_st
 	} while (gpio_get_value(pdata->gpio));
 }
 
-static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void pcap_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct pcap_chip *pcap = irq_get_handler_data(irq);
 
 	desc->irq_data.chip->irq_ack(&desc->irq_data);
--- /var/linuxes/linux-next/drivers/mfd/htc-egpio.c	2013-08-05 14:50:16.000000000 +0200
+++ /var/julia/linuxcopy/drivers/mfd/htc-egpio.c	2015-06-13 10:30:58.371543530 +0200
@@ -98,7 +98,7 @@ static struct irq_chip egpio_muxed_chip
 	.irq_unmask	= egpio_unmask,
 };
 
-static void egpio_handler(unsigned int irq, struct irq_desc *desc)
+static void egpio_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	struct egpio_info *ei = irq_desc_get_handler_data(desc);
 	int irqpin;
--- /var/linuxes/linux-next/drivers/mfd/jz4740-adc.c	2014-11-16 10:01:31.109268453 +0100
+++ /var/julia/linuxcopy/drivers/mfd/jz4740-adc.c	2015-06-13 10:30:57.827543550 +0200
@@ -65,7 +65,7 @@ struct jz4740_adc {
 	spinlock_t lock;
 };
 
-static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void jz4740_adc_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
 	struct irq_chip_generic *gc = irq_desc_get_handler_data(desc);
 	uint8_t status;
--- /var/linuxes/linux-next/drivers/mfd/pm8921-core.c	2014-11-16 10:01:31.109268453 +0100
+++ /var/julia/linuxcopy/drivers/mfd/pm8921-core.c	2015-06-13 10:30:57.355543567 +0200
@@ -156,7 +156,7 @@ static int pm8xxx_irq_master_handler(str
 	return ret;
 }
 
-static void pm8xxx_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void pm8xxx_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
 	struct pm_irq_chip *chip = irq_desc_get_handler_data(desc);
 	struct irq_chip *irq_chip = irq_desc_get_chip(desc);
--- /var/linuxes/linux-next/drivers/mfd/t7l66xb.c	2014-11-25 11:25:19.784159723 +0100
+++ /var/julia/linuxcopy/drivers/mfd/t7l66xb.c	2015-06-13 10:30:59.315543495 +0200
@@ -185,8 +185,9 @@ static struct mfd_cell t7l66xb_cells[] =
 /*--------------------------------------------------------------------------*/
 
 /* Handle the T7L66XB interrupt mux */
-static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)
+static void t7l66xb_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct t7l66xb *t7l66xb = irq_get_handler_data(irq);
 	unsigned int isr;
 	unsigned int i, irq_base;
--- /var/linuxes/linux-next/drivers/mfd/tc6393xb.c	2014-11-16 10:01:31.109268453 +0100
+++ /var/julia/linuxcopy/drivers/mfd/tc6393xb.c	2015-06-13 10:30:59.051543504 +0200
@@ -523,8 +523,9 @@ static int tc6393xb_register_gpio(struct
 /*--------------------------------------------------------------------------*/
 
 static void
-tc6393xb_irq(unsigned int irq, struct irq_desc *desc)
+tc6393xb_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct tc6393xb *tc6393xb = irq_get_handler_data(irq);
 	unsigned int isr;
 	unsigned int i, irq_base;
--- /var/linuxes/linux-next/drivers/mfd/ucb1x00-core.c	2014-09-28 16:59:48.781931441 +0200
+++ /var/julia/linuxcopy/drivers/mfd/ucb1x00-core.c	2015-06-13 10:30:57.575543559 +0200
@@ -282,8 +282,9 @@ void ucb1x00_adc_disable(struct ucb1x00
  * SIBCLK to talk to the chip.  We leave the clock running until
  * we have finished processing all interrupts from the chip.
  */
-static void ucb1x00_irq(unsigned int irq, struct irq_desc *desc)
+static void ucb1x00_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct ucb1x00 *ucb = irq_desc_get_handler_data(desc);
 	unsigned int isr, i;
 
--- /var/linuxes/linux-next/drivers/pci/host/pci-keystone.c	2015-02-09 14:08:01.403569005 +0100
+++ /var/julia/linuxcopy/drivers/pci/host/pci-keystone.c	2015-06-13 10:30:53.511543710 +0200
@@ -112,8 +112,9 @@ static int ks_pcie_establish_link(struct
 	return 0;
 }
 
-static void ks_pcie_msi_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ks_pcie_msi_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc);
 	u32 offset = irq - ks_pcie->msi_host_irqs[0];
 	struct pcie_port *pp = &ks_pcie->pp;
@@ -139,8 +140,10 @@ static void ks_pcie_msi_irq_handler(unsi
  * Traverse through pending legacy interrupts and invoke handler for each. Also
  * takes care of interrupt controller level mask/ack operation.
  */
-static void ks_pcie_legacy_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ks_pcie_legacy_irq_handler(unsigned int __irq,
+				       struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc);
 	struct pcie_port *pp = &ks_pcie->pp;
 	u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0];
--- /var/linuxes/linux-next/drivers/pinctrl/mediatek/pinctrl-mtk-common.c	2015-06-11 07:18:48.742399401 +0200
+++ /var/julia/linuxcopy/drivers/pinctrl/mediatek/pinctrl-mtk-common.c	2015-06-13 10:30:49.699543852 +0200
@@ -1116,8 +1116,9 @@ mtk_eint_debounce_process(struct mtk_pin
 	}
 }
 
-static void mtk_eint_irq_handler(unsigned irq, struct irq_desc *desc)
+static void mtk_eint_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	struct mtk_pinctrl *pctl = irq_get_handler_data(irq);
 	unsigned int status, eint_num;
--- /var/linuxes/linux-next/drivers/pinctrl/pinctrl-adi2.c	2015-05-25 16:03:31.763858305 +0200
+++ /var/julia/linuxcopy/drivers/pinctrl/pinctrl-adi2.c	2015-06-13 10:30:50.631543818 +0200
@@ -530,8 +530,8 @@ static inline void preflow_handler(struc
 static inline void preflow_handler(struct irq_desc *desc) { }
 #endif
 
-static void adi_gpio_handle_pint_irq(unsigned int inta_irq,
-			struct irq_desc *desc)
+static void adi_gpio_handle_pint_irq(unsigned int __inta_irq,
+				     struct irq_desc *desc)
 {
 	u32 request;
 	u32 level_mask, hwirq;
--- /var/linuxes/linux-next/drivers/pinctrl/pinctrl-rockchip.c	2015-02-09 14:08:01.407569005 +0100
+++ /var/julia/linuxcopy/drivers/pinctrl/pinctrl-rockchip.c	2015-06-13 10:30:49.195543871 +0200
@@ -1394,8 +1394,9 @@ static const struct gpio_chip rockchip_g
  * Interrupt handling
  */
 
-static void rockchip_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void rockchip_irq_demux(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	struct rockchip_pin_bank *bank = irq_get_handler_data(irq);
 	u32 pend;
--- /var/linuxes/linux-next/drivers/pinctrl/pinctrl-single.c	2015-05-25 16:03:31.787858304 +0200
+++ /var/julia/linuxcopy/drivers/pinctrl/pinctrl-single.c	2015-06-13 10:30:50.263543831 +0200
@@ -1679,8 +1679,9 @@ static irqreturn_t pcs_irq_handler(int i
  * Use this if you have a separate interrupt for each
  * pinctrl-single instance.
  */
-static void pcs_irq_chain_handler(unsigned int irq, struct irq_desc *desc)
+static void pcs_irq_chain_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct pcs_soc_data *pcs_soc = irq_desc_get_handler_data(desc);
 	struct irq_chip *chip;
 
--- /var/linuxes/linux-next/drivers/pinctrl/pinctrl-st.c	2015-04-11 07:10:38.336609519 +0200
+++ /var/julia/linuxcopy/drivers/pinctrl/pinctrl-st.c	2015-06-13 10:30:51.115543800 +0200
@@ -1472,8 +1472,9 @@ static void st_gpio_irq_handler(unsigned
 	chained_irq_exit(chip, desc);
 }
 
-static void st_gpio_irqmux_handler(unsigned irq, struct irq_desc *desc)
+static void st_gpio_irqmux_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	struct st_pinctrl *info = irq_get_handler_data(irq);
 	unsigned long status;
--- /var/linuxes/linux-next/drivers/pinctrl/samsung/pinctrl-exynos.c	2015-03-21 14:32:47.370972869 +0100
+++ /var/julia/linuxcopy/drivers/pinctrl/samsung/pinctrl-exynos.c	2015-06-13 10:30:52.039543765 +0200
@@ -420,8 +420,9 @@ static const struct of_device_id exynos_
 };
 
 /* interrupt handler for wakeup interrupts 0..15 */
-static void exynos_irq_eint0_15(unsigned int irq, struct irq_desc *desc)
+static void exynos_irq_eint0_15(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct exynos_weint_data *eintd = irq_get_handler_data(irq);
 	struct samsung_pin_bank *bank = eintd->bank;
 	struct irq_chip *chip = irq_get_chip(irq);
@@ -452,8 +453,10 @@ static inline void exynos_irq_demux_eint
 }
 
 /* interrupt handler for wakeup interrupt 16 */
-static void exynos_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)
+static void exynos_irq_demux_eint16_31(unsigned int __irq,
+				       struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	struct exynos_muxed_weint_data *eintd = irq_get_handler_data(irq);
 	struct samsung_pinctrl_drv_data *d = eintd->banks[0]->drvdata;
--- /var/linuxes/linux-next/drivers/pinctrl/samsung/pinctrl-s3c64xx.c	2014-11-16 10:01:31.237268448 +0100
+++ /var/julia/linuxcopy/drivers/pinctrl/samsung/pinctrl-s3c64xx.c	2015-06-13 10:30:52.307543755 +0200
@@ -408,8 +408,9 @@ static const struct irq_domain_ops s3c64
 	.xlate	= irq_domain_xlate_twocell,
 };
 
-static void s3c64xx_eint_gpio_irq(unsigned int irq, struct irq_desc *desc)
+static void s3c64xx_eint_gpio_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	struct s3c64xx_eint_gpio_data *data = irq_get_handler_data(irq);
 	struct samsung_pinctrl_drv_data *drvdata = data->drvdata;
--- /var/linuxes/linux-next/drivers/pinctrl/sunxi/pinctrl-sunxi.c	2015-03-21 14:32:47.374972869 +0100
+++ /var/julia/linuxcopy/drivers/pinctrl/sunxi/pinctrl-sunxi.c	2015-06-13 10:30:48.607543893 +0200
@@ -709,8 +709,9 @@ static struct irq_chip sunxi_pinctrl_lev
 			  IRQCHIP_EOI_IF_HANDLED,
 };
 
-static void sunxi_pinctrl_irq_handler(unsigned irq, struct irq_desc *desc)
+static void sunxi_pinctrl_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	struct sunxi_pinctrl *pctl = irq_get_handler_data(irq);
 	unsigned long bank, reg, val;
--- /var/linuxes/linux-next/drivers/sh/intc/core.c	2014-05-24 11:54:34.141699344 +0200
+++ /var/julia/linuxcopy/drivers/sh/intc/core.c	2015-06-13 10:30:48.275543905 +0200
@@ -65,8 +65,9 @@ void intc_set_prio_level(unsigned int ir
 	raw_spin_unlock_irqrestore(&intc_big_lock, flags);
 }
 
-static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc)
+static void intc_redirect_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	generic_handle_irq((unsigned int)irq_get_handler_data(irq));
 }
 
--- /var/linuxes/linux-next/drivers/sh/intc/virq.c	2012-06-03 21:09:50.000000000 +0200
+++ /var/julia/linuxcopy/drivers/sh/intc/virq.c	2015-06-13 10:30:47.987543916 +0200
@@ -107,8 +107,9 @@ static int add_virq_to_pirq(unsigned int
 	return 0;
 }
 
-static void intc_virq_handler(unsigned int irq, struct irq_desc *desc)
+static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_data *data = irq_get_irq_data(irq);
 	struct irq_chip *chip = irq_data_get_irq_chip(data);
 	struct intc_virq_list *entry, *vlist = irq_data_get_irq_handler_data(data);
--- /var/linuxes/linux-next/drivers/spmi/spmi-pmic-arb.c	2015-04-02 22:08:46.183526934 +0200
+++ /var/julia/linuxcopy/drivers/spmi/spmi-pmic-arb.c	2015-06-13 10:30:57.171543574 +0200
@@ -451,8 +451,9 @@ static void periph_interrupt(struct spmi
 	}
 }
 
-static void pmic_arb_chained_irq(unsigned int irq, struct irq_desc *desc)
+static void pmic_arb_chained_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct spmi_pmic_arb_dev *pa = irq_get_handler_data(irq);
 	struct irq_chip *chip = irq_get_chip(irq);
 	void __iomem *intr = pa->intr;
--- /var/linuxes/linux-next/kernel/irq/chip.c	2015-05-26 21:47:09.183877948 +0200
+++ /var/julia/linuxcopy/kernel/irq/chip.c	2015-06-13 10:31:57.419541333 +0200
@@ -383,8 +383,9 @@ static bool irq_may_run(struct irq_desc
  *	unmask issues if necessary.
  */
 void
-handle_simple_irq(unsigned int irq, struct irq_desc *desc)
+handle_simple_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	raw_spin_lock(&desc->lock);
 
 	if (!irq_may_run(desc))
@@ -434,8 +435,9 @@ static void cond_unmask_irq(struct irq_d
  *	interrupt line is back to inactive.
  */
 void
-handle_level_irq(unsigned int irq, struct irq_desc *desc)
+handle_level_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	raw_spin_lock(&desc->lock);
 	mask_ack_irq(desc);
 
@@ -505,8 +507,9 @@ static void cond_unmask_eoi_irq(struct i
  *	details in hardware, transparently.
  */
 void
-handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
+handle_fasteoi_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = desc->irq_data.chip;
 
 	raw_spin_lock(&desc->lock);
@@ -561,8 +564,9 @@ EXPORT_SYMBOL_GPL(handle_fasteoi_irq);
  *	loop is left.
  */
 void
-handle_edge_irq(unsigned int irq, struct irq_desc *desc)
+handle_edge_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	raw_spin_lock(&desc->lock);
 
 	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
@@ -624,8 +628,9 @@ EXPORT_SYMBOL(handle_edge_irq);
  * Similar as the above handle_edge_irq, but using eoi and w/o the
  * mask/unmask logic.
  */
-void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc)
+void handle_edge_eoi_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 
 	raw_spin_lock(&desc->lock);
@@ -671,8 +676,9 @@ out_eoi:
  *	Per CPU interrupts on SMP machines without locking requirements
  */
 void
-handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
+handle_percpu_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 
 	kstat_incr_irqs_this_cpu(irq, desc);
@@ -698,8 +704,9 @@ handle_percpu_irq(unsigned int irq, stru
  * contain the real device id for the cpu on which this handler is
  * called
  */
-void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc)
+void handle_percpu_devid_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct irqaction *action = desc->action;
 	void *dev_id = raw_cpu_ptr(action->percpu_dev_id);
--- /var/linuxes/linux-next/kernel/irq/handle.c	2014-03-26 18:13:37.966022636 +0100
+++ /var/julia/linuxcopy/kernel/irq/handle.c	2015-06-13 10:31:25.603542517 +0200
@@ -27,8 +27,9 @@
  *
  * Handles spurious and unhandled IRQ's. It also prints a debugmessage.
  */
-void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
+void handle_bad_irq(unsigned int __irq, struct irq_desc *desc)
 {
+	unsigned int irq = irq_desc_get_irq(desc);
 	print_irq_desc(irq, desc);
 	kstat_incr_irqs_this_cpu(irq, desc);
 	ack_bad_irq(irq);