[PATCH] ARM: fixup irqflags breakage after ARM genirq merge

The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

56 files changed, 71 insertions, 69 deletions

diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c
index 31b65e2231d9..3f60dd9aca80 100644
--- a/arch/arm/common/time-acorn.c
+++ b/arch/arm/common/time-acorn.c
@@ -77,7 +77,7 @@ ioc_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction ioc_timer_irq = {
         .name           = "timer",
-        .flags          = SA_INTERRUPT,
+        .flags          = IRQF_DISABLED,
         .handler        = ioc_timer_interrupt
 };
 
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c
index aa01d6753d6e..baa997c857dc 100644
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c
@@ -142,7 +142,7 @@ aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction aaec2000_timer_irq = {
         .name           = "AAEC-2000 Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = aaec2000_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-at91rm9200/at91rm9200_time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c
index 0aa22650a00f..a92a8622c78a 100644
--- a/arch/arm/mach-at91rm9200/at91rm9200_time.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200_time.c
@@ -85,7 +85,7 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id, struct pt_r
 
 static struct irqaction at91rm9200_timer_irq = {
         .name           = "at91_tick",
-        .flags          = SA_SHIRQ | SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER,
         .handler        = at91rm9200_timer_interrupt
 };
 
diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c
index b0f1db258e80..a071eac4a30a 100644
--- a/arch/arm/mach-clps711x/time.c
+++ b/arch/arm/mach-clps711x/time.c
@@ -58,7 +58,7 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction clps711x_timer_irq = {
         .name           = "CLPS711x Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = p720t_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index cd66df896364..92eaebdd5606 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -316,7 +316,7 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction clps7500_timer_irq = {
         .name           = "CLPS7500 Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = clps7500_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 6d620d8268cc..70dd12ef3c40 100644
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -199,7 +199,7 @@ ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction ebsa110_timer_irq = {
         .name           = "EBSA110 Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = ebsa110_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 26df3b666b56..a87a784b9201 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -116,7 +116,7 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction ep93xx_timer_irq = {
         .name           = "ep93xx timer",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = ep93xx_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c
index e668d4acd808..2af610811ca4 100644
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@ -44,7 +44,7 @@ timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction footbridge_timer_irq = {
         .name           = "Timer1 timer tick",
         .handler        = timer1_interrupt,
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
 /*
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index 5dace2597838..607ed1f5b3f8 100644
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
@@ -332,15 +332,15 @@ void __init dc21285_preinit(void)
         /*
          * We don't care if these fail.
          */
-        request_irq(IRQ_PCI_SERR, dc21285_serr_irq, SA_INTERRUPT,
+        request_irq(IRQ_PCI_SERR, dc21285_serr_irq, IRQF_DISABLED,
                     "PCI system error", &serr_timer);
-        request_irq(IRQ_PCI_PERR, dc21285_parity_irq, SA_INTERRUPT,
+        request_irq(IRQ_PCI_PERR, dc21285_parity_irq, IRQF_DISABLED,
                     "PCI parity error", &perr_timer);
-        request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, SA_INTERRUPT,
+        request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, IRQF_DISABLED,
                     "PCI abort", NULL);
-        request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, SA_INTERRUPT,
+        request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, IRQF_DISABLED,
                     "Discard timer", NULL);
-        request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, SA_INTERRUPT,
+        request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, IRQF_DISABLED,
                     "PCI data parity", NULL);
 
         if (cfn_mode) {
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index 282b473c21f2..c4810a40c8e1 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -73,7 +73,7 @@ isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction isa_timer_irq = {
         .name           = "ISA timer tick",
         .handler        = isa_timer_interrupt,
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
 static void __init isa_timer_init(void)
diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c
index af9e4a5d5ea7..a9a8255a3a03 100644
--- a/arch/arm/mach-h720x/cpu-h7201.c
+++ b/arch/arm/mach-h720x/cpu-h7201.c
@@ -41,7 +41,7 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction h7201_timer_irq = {
         .name           = "h7201 Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = h7201_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index a4a7c0125d03..da678d163fd9 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -171,7 +171,7 @@ static struct irqchip h7202_timerx_chip = {
 
 static struct irqaction h7202_timer_irq = {
         .name           = "h7202 Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = h7202_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index 5f9a04775a47..6ed7523c65bb 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -72,7 +72,7 @@ imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction imx_timer_irq = {
         .name           = "i.MX Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = imx_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 2d7e505e748f..42021fdfa0c6 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -282,7 +282,7 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction integrator_timer_irq = {
         .name           = "Integrator Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = integrator_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c
index bc07f52a6fd7..ee49cf790dab 100644
--- a/arch/arm/mach-integrator/time.c
+++ b/arch/arm/mach-integrator/time.c
@@ -125,7 +125,7 @@ static int rtc_probe(struct amba_device *dev, void *id)
 
         xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);
 
-        ret = request_irq(dev->irq[0], arm_rtc_interrupt, SA_INTERRUPT,
+        ret = request_irq(dev->irq[0], arm_rtc_interrupt, IRQF_DISABLED,
                           "rtc-pl030", dev);
         if (ret)
                 goto map_out;
diff --git a/arch/arm/mach-iop3xx/iop321-time.c b/arch/arm/mach-iop3xx/iop321-time.c
index d67ac0e5d438..04b1a6f7ebae 100644
--- a/arch/arm/mach-iop3xx/iop321-time.c
+++ b/arch/arm/mach-iop3xx/iop321-time.c
@@ -85,7 +85,7 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction iop321_timer_irq = {
         .name           = "IOP321 Timer Tick",
         .handler        = iop321_timer_interrupt,
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
 static void __init iop321_timer_init(void)
diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c
index 3c1f0ebbd636..0c09e74c5740 100644
--- a/arch/arm/mach-iop3xx/iop331-time.c
+++ b/arch/arm/mach-iop3xx/iop331-time.c
@@ -82,7 +82,7 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction iop331_timer_irq = {
         .name           = "IOP331 Timer Tick",
         .handler        = iop331_timer_interrupt,
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
 static void __init iop331_timer_init(void)
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index b31f31ac937b..7f91f689a041 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -224,7 +224,7 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction ixp2000_timer_irq = {
         .name           = "IXP2000 Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = ixp2000_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index 7c218aecf443..566a07821c77 100644
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -363,7 +363,7 @@ ixp23xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction ixp23xx_timer_irq = {
         .name           = "IXP23xx Timer Tick",
         .handler        = ixp23xx_timer_interrupt,
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
 void __init ixp23xx_init_timer(void)
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 13c7c629d037..7c25dbd5a181 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -287,7 +287,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs
 
 static struct irqaction ixp4xx_timer_irq = {
         .name           = "IXP4xx Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = ixp4xx_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c
index f58a1d05a02e..81ffcae1f56e 100644
--- a/arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -42,7 +42,7 @@ static int __init nas100d_power_init(void)
         set_irq_type(NAS100D_RB_IRQ, IRQT_LOW);
 
         if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler,
-                SA_INTERRUPT, "NAS100D reset button", NULL) < 0) {
+                IRQF_DISABLED, "NAS100D reset button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                         NAS100D_RB_IRQ);
diff --git a/arch/arm/mach-ixp4xx/nslu2-power.c b/arch/arm/mach-ixp4xx/nslu2-power.c
index 6d38e97142cc..e2a2230b69f0 100644
--- a/arch/arm/mach-ixp4xx/nslu2-power.c
+++ b/arch/arm/mach-ixp4xx/nslu2-power.c
@@ -54,7 +54,7 @@ static int __init nslu2_power_init(void)
         set_irq_type(NSLU2_PB_IRQ, IRQT_HIGH);
 
         if (request_irq(NSLU2_RB_IRQ, &nslu2_reset_handler,
-                SA_INTERRUPT, "NSLU2 reset button", NULL) < 0) {
+                IRQF_DISABLED, "NSLU2 reset button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                         NSLU2_RB_IRQ);
@@ -63,7 +63,7 @@ static int __init nslu2_power_init(void)
         }
 
         if (request_irq(NSLU2_PB_IRQ, &nslu2_power_handler,
-                SA_INTERRUPT, "NSLU2 power button", NULL) < 0) {
+                IRQF_DISABLED, "NSLU2 power button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Power Button IRQ %d not available\n",
                         NSLU2_PB_IRQ);
diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c
index 4d26c9f62c71..ad5652e01507 100644
--- a/arch/arm/mach-lh7a40x/time.c
+++ b/arch/arm/mach-lh7a40x/time.c
@@ -53,7 +53,7 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction lh7a40x_timer_irq = {
         .name           = "LHA740x Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = lh7a40x_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index edfbdf40c600..6d72c81b7d9f 100644
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -54,7 +54,7 @@ netx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction netx_timer_irq = {
         .name           = "NetX Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = netx_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 91933301bb73..b742261c97ad 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -357,7 +357,7 @@ static void __init osk_mistral_init(void)
                  */
                 ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)),
                                 &osk_mistral_wake_interrupt,
-                                SA_SHIRQ, "mistral_wakeup",
+                                IRQF_SHARED, "mistral_wakeup",
                                 &osk_mistral_wake_interrupt);
                 if (ret != 0) {
                         omap_free_gpio(OMAP_MPUIO(2));
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 880cd2d8f4aa..34eb79ee6e61 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -133,7 +133,7 @@ static struct irqchip omap_fpga_irq = {
  * mask_ack routine for all of the FPGA interrupts has been changed from
  * fpga_mask_ack_irq() to fpga_ack_irq() so that the specific FPGA interrupt
  * being serviced is left unmasked.  We can do this because the FPGA cascade
- * interrupt is installed with the SA_INTERRUPT flag, which leaves all
+ * interrupt is installed with the IRQF_DISABLED flag, which leaves all
  * interrupts masked at the CPU while an FPGA interrupt handler executes.
  *
  * Limited testing indicates that this workaround appears to be effective
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 1b4e1d57afb1..cd76185bab74 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -690,7 +690,7 @@ static irqreturn_t  omap_wakeup_interrupt(int  irq, void *  dev,
 
 static struct irqaction omap_wakeup_irq = {
         .name           = "peripheral wakeup",
-        .flags          = SA_INTERRUPT,
+        .flags          = IRQF_DISABLED,
         .handler        = omap_wakeup_interrupt
 };
 
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 5615fb8a3d5b..976edfb882e2 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -253,7 +253,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)
         }
         omap_set_gpio_direction(gpio_nr, 1);
         ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,
-                          SA_TRIGGER_RISING, "serial wakeup", NULL);
+                          IRQF_TRIGGER_RISING, "serial wakeup", NULL);
         if (ret) {
                 omap_free_gpio(gpio_nr);
                 printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index a01f0efdae14..4d91b9f51084 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -177,7 +177,7 @@ static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id,
 
 static struct irqaction omap_mpu_timer_irq = {
         .name           = "mpu timer",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = omap_mpu_timer_interrupt,
 };
 
@@ -191,7 +191,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id,
 
 static struct irqaction omap_mpu_timer1_irq = {
         .name           = "mpu timer1 overflow",
-        .flags          = SA_INTERRUPT,
+        .flags          = IRQF_DISABLED,
         .handler        = omap_mpu_timer1_interrupt,
 };
 
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 6c6ba172cdf6..7993b7bae2bd 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -234,17 +234,17 @@ static void __init apollon_sw_init(void)
 
         set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQT_RISING);
         if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
-                                SA_SHIRQ, "enter sw",
+                                IRQF_SHARED, "enter sw",
                                 &apollon_sw_interrupt))
                 return;
         set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQT_RISING);
         if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt,
-                                SA_SHIRQ, "up sw",
+                                IRQF_SHARED, "up sw",
                                 &apollon_sw_interrupt))
                 return;
         set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQT_RISING);
         if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt,
-                                SA_SHIRQ, "down sw",
+                                IRQF_SHARED, "down sw",
                                 &apollon_sw_interrupt))
                 return;
 }
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index cf78e6c5a277..fe5fd6d42dea 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -52,7 +52,7 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id,
 
 static struct irqaction omap2_gp_timer_irq = {
         .name           = "gp timer",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = omap2_gp_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c
index 4ce680698529..888bf6cfba8a 100644
--- a/arch/arm/mach-pnx4008/time.c
+++ b/arch/arm/mach-pnx4008/time.c
@@ -86,7 +86,7 @@ static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id,
 
 static struct irqaction pnx4008_timer_irq = {
         .name = "PNX4008 Tick Timer",
-        .flags = SA_INTERRUPT | SA_TIMER,
+        .flags = IRQF_DISABLED | IRQF_TIMER,
         .handler = pnx4008_timer_interrupt
 };
 
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index bf6648a83901..cce26576999e 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -225,7 +225,7 @@ static int corgi_mci_init(struct device *dev, irqreturn_t (*corgi_detect_int)(in
         corgi_mci_platform_data.detect_delay = msecs_to_jiffies(250);
 
         err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int,
-                          SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                          IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                           "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "corgi_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 1ab26c6914f2..6a9a669d60de 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -419,7 +419,7 @@ static int lubbock_mci_init(struct device *dev,
         init_timer(&mmc_timer);
         mmc_timer.data = (unsigned long) data;
         return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,
-                        SA_SAMPLE_RANDOM, "lubbock-sd-detect", data);
+                        IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data);
 }
 
 static int lubbock_mci_get_ro(struct device *dev)
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index b307f11951df..21ddf3de2f6e 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -331,7 +331,7 @@ static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_in
          */
         MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL;
 
-        err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int, SA_INTERRUPT,
+        err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int, IRQF_DISABLED,
                              "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "mainstone_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 9a9fa87cea9f..6dbff6d94801 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -212,7 +212,7 @@ static int poodle_mci_init(struct device *dev, irqreturn_t (*poodle_detect_int)(
         poodle_mci_platform_data.detect_delay = msecs_to_jiffies(250);
 
         err = request_irq(POODLE_IRQ_GPIO_nSD_DETECT, poodle_detect_int,
-                          SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                          IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                           "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "poodle_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 1e5e6ca693ee..db6e8f56a75f 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -142,18 +142,18 @@ void sharpsl_pm_pxa_init(void)
         pxa_gpio_mode(sharpsl_pm.machinfo->gpio_batlock | GPIO_IN);
 
         /* Register interrupt handlers */
-        if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, SA_INTERRUPT, "AC Input Detect", sharpsl_ac_isr)) {
+        if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED, "AC Input Detect", sharpsl_ac_isr)) {
                 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin));
         }
         else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin),IRQT_BOTHEDGE);
 
-        if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, SA_INTERRUPT, "Battery Cover", sharpsl_fatal_isr)) {
+        if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED, "Battery Cover", sharpsl_fatal_isr)) {
                 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock));
         }
         else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock),IRQT_FALLING);
 
         if (sharpsl_pm.machinfo->gpio_fatal) {
-                if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, SA_INTERRUPT, "Fatal Battery", sharpsl_fatal_isr)) {
+                if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED, "Fatal Battery", sharpsl_fatal_isr)) {
                         dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal));
                 }
                 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal),IRQT_FALLING);
@@ -162,7 +162,7 @@ void sharpsl_pm_pxa_init(void)
         if (sharpsl_pm.machinfo->batfull_irq)
         {
                 /* Register interrupt handler. */
-                if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, SA_INTERRUPT, "CO", sharpsl_chrg_full_isr)) {
+                if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED, "CO", sharpsl_chrg_full_isr)) {
                         dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull));
                 }
                 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull),IRQT_RISING);
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index eb9937f6f5cd..1c32a9310dc2 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -308,7 +308,7 @@ static int spitz_mci_init(struct device *dev, irqreturn_t (*spitz_detect_int)(in
         spitz_mci_platform_data.detect_delay = msecs_to_jiffies(250);
 
         err = request_irq(SPITZ_IRQ_GPIO_nSD_DETECT, spitz_detect_int,
-                          SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                          IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                           "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "spitz_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 1ef85fcc6c06..5dbd191c57c4 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -117,7 +117,7 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction pxa_timer_irq = {
         .name           = "PXA Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = pxa_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 7152bc13680f..249353616aba 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -185,7 +185,7 @@ static int tosa_mci_init(struct device *dev, irqreturn_t (*tosa_detect_int)(int,
 
         tosa_mci_platform_data.detect_delay = msecs_to_jiffies(250);
 
-        err = request_irq(TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int, SA_INTERRUPT,
+        err = request_irq(TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int, IRQF_DISABLED,
                                 "MMC/SD card detect", data);
         if (err) {
                 printk(KERN_ERR "tosa_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 4ffff9e95eca..7c3007df1bd6 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -283,7 +283,9 @@ static int trizeps4_mci_init(struct device *dev, irqreturn_t (*mci_detect_int)(i
 
         pxa_gpio_mode(GPIO_MMC_DET | GPIO_IN);
 
-        err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int, SA_INTERRUPT | SA_TRIGGER_RISING, "MMC card detect", data);
+        err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,
+                          IRQF_DISABLED | IRQF_TRIGGER_RISING,
+                          "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
                 return -1;
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index eb09d3859d6d..da0286973823 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -536,7 +536,7 @@ static irqreturn_t realview_timer_interrupt(int irq, void *dev_id, struct pt_reg
 
 static struct irqaction realview_timer_irq = {
         .name           = "RealView Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = realview_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c
index bd86ffba8810..ac511d41d4d7 100644
--- a/arch/arm/mach-rpc/dma.c
+++ b/arch/arm/mach-rpc/dma.c
@@ -128,7 +128,7 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id, struct pt_regs *regs)
 static int iomd_request_dma(dmach_t channel, dma_t *dma)
 {
         return request_irq(dma->dma_irq, iomd_dma_handle,
-                           SA_INTERRUPT, dma->device_id, dma);
+                           IRQF_DISABLED, dma->device_id, dma);
 }
 
 static void iomd_free_dma(dmach_t channel, dma_t *dma)
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index b0aaf4328732..094cc52745c5 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -718,7 +718,7 @@ int s3c2410_dma_request(unsigned int channel, s3c2410_dma_client_t *client,
                 pr_debug("dma%d: %s : requesting irq %d\n",
                          channel, __FUNCTION__, chan->irq);
 
-                err = request_irq(chan->irq, s3c2410_dma_irq, SA_INTERRUPT,
+                err = request_irq(chan->irq, s3c2410_dma_irq, IRQF_DISABLED,
                                   client->name, (void *)chan);
 
                 if (err) {
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index c153c49c75dc..00d1cfca9712 100644
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -138,7 +138,7 @@ s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction s3c2410_timer_irq = {
         .name           = "S3C2410 Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = s3c2410_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c
index 495f8c6ffcb6..6b22d8f0a00d 100644
--- a/arch/arm/mach-s3c2410/usb-simtec.c
+++ b/arch/arm/mach-s3c2410/usb-simtec.c
@@ -85,8 +85,8 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
 
         if (on) {
                 ret = request_irq(IRQ_USBOC, usb_simtec_ocirq,
-                                  SA_INTERRUPT | SA_TRIGGER_RISING |
-                                   SA_TRIGGER_FALLING,
+                                  IRQF_DISABLED | IRQF_TRIGGER_RISING |
+                                   IRQF_TRIGGER_FALLING,
                                   "USB Over-current", info);
                 if (ret != 0) {
                         printk(KERN_ERR "failed to request usb oc irq\n");
diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c
index 696d7d29c8a5..45b1e71f111d 100644
--- a/arch/arm/mach-sa1100/collie_pm.c
+++ b/arch/arm/mach-sa1100/collie_pm.c
@@ -45,12 +45,12 @@ static void collie_charger_init(void)
         }
 
         /* Register interrupt handler. */
-        if ((err = request_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr, SA_INTERRUPT,
+        if ((err = request_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr, IRQF_DISABLED,
                                "ACIN", sharpsl_ac_isr))) {
                 printk("Could not get irq %d.\n", COLLIE_IRQ_GPIO_AC_IN);
                 return;
         }
-        if ((err = request_irq(COLLIE_IRQ_GPIO_CO, sharpsl_chrg_full_isr, SA_INTERRUPT,
+        if ((err = request_irq(COLLIE_IRQ_GPIO_CO, sharpsl_chrg_full_isr, IRQF_DISABLED,
                                "CO", sharpsl_chrg_full_isr))) {
                 free_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr);
                 printk("Could not get irq %d.\n", COLLIE_IRQ_GPIO_CO);
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c
index be0e4427bec7..3c6441d4bc59 100644
--- a/arch/arm/mach-sa1100/dma.c
+++ b/arch/arm/mach-sa1100/dma.c
@@ -124,7 +124,7 @@ int sa1100_request_dma (dma_device_t device, const char *device_id,
 
         i = dma - dma_chan;
         regs = (dma_regs_t *)&DDAR(i);
-        err = request_irq(IRQ_DMA0 + i, dma_irq_handler, SA_INTERRUPT,
+        err = request_irq(IRQ_DMA0 + i, dma_irq_handler, IRQF_DISABLED,
                           device_id, regs);
         if (err) {
                 printk(KERN_ERR
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index e10d661c015f..7364478cec12 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -740,7 +740,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re
 static struct irqaction h3800_irq = {
         .name           = "h3800_asic",
         .handler        = h3800_IRQ_demux,
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
 u32 kpio_int_shadow = 0;
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 688b1e109a40..49ae716e16c2 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -111,7 +111,7 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction sa1100_timer_irq = {
         .name           = "SA11xx Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = sa1100_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index 2f2c6e97b7a3..1095df34fec0 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -90,7 +90,7 @@ shark_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction shark_timer_irq = {
         .name           = "Shark Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = shark_timer_interrupt,
 };
 
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 08de8490fb69..a432539cc1bd 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -869,7 +869,7 @@ static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_re
 
 static struct irqaction versatile_timer_irq = {
         .name           = "Versatile Timer Tick",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = versatile_timer_interrupt,
 };
 
diff --git a/arch/arm/oprofile/op_model_xscale.c b/arch/arm/oprofile/op_model_xscale.c
index e0f0b320d76c..34fdc733743b 100644
--- a/arch/arm/oprofile/op_model_xscale.c
+++ b/arch/arm/oprofile/op_model_xscale.c
@@ -384,7 +384,7 @@ static int xscale_pmu_start(void)
         int ret;
         u32 pmnc = read_pmnc();
 
-        ret = request_irq(XSCALE_PMU_IRQ, xscale_pmu_interrupt, SA_INTERRUPT,
+        ret = request_irq(XSCALE_PMU_IRQ, xscale_pmu_interrupt, IRQF_DISABLED,
                         "XScale PMU", (void *)results);
 
         if (ret < 0) {
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index c2c05ef86348..9eddc9507147 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -939,7 +939,7 @@ static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id,
 static struct irqaction omap24xx_dma_irq = {
         .name = "DMA",
         .handler = omap2_dma_irq_handler,
-        .flags = SA_INTERRUPT
+        .flags = IRQF_DISABLED
 };
 
 #else
diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index 1a24e2c10714..04b4102727a8 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -580,7 +580,7 @@ static irqreturn_t  omap_wakeup_interrupt(int  irq, void *  dev,
 
 static struct irqaction omap_wakeup_irq = {
         .name           = "peripheral wakeup",
-        .flags          = SA_INTERRUPT,
+        .flags          = IRQF_DISABLED,
         .handler        = omap_wakeup_interrupt
 };
 
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c
index ddf4360dea72..281ecc7fcdfc 100644
--- a/arch/arm/plat-omap/timer32k.c
+++ b/arch/arm/plat-omap/timer32k.c
@@ -258,7 +258,7 @@ static struct dyn_tick_timer omap_dyn_tick_timer = {
 
 static struct irqaction omap_32k_timer_irq = {
         .name           = "32KHz timer",
-        .flags          = SA_INTERRUPT | SA_TIMER,
+        .flags          = IRQF_DISABLED | IRQF_TIMER,
         .handler        = omap_32k_timer_interrupt,
 };