[PATCH] irq-flags: V850: Use the new IRQF_ constants

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/v850/kernel/gbus_int.c b/arch/v850/kernel/gbus_int.c
index 92918b8d89ef61d87cc86eccddd57aed68a8e3c1..25d636e79e6acfe59be1fc933632ad894e880a21 100644 (file)
--- a/arch/v850/kernel/gbus_int.c
+++ b/arch/v850/kernel/gbus_int.c
@@ -154,7 +154,7 @@ static unsigned gbus_int_startup_irq (unsigned irq)
                /* First enable the CPU interrupt.  */
                int rval =
                        request_irq (IRQ_GINT(gint), gbus_int_handle_irq,
-                                    SA_INTERRUPT,
+                                    IRQF_DISABLED,
                                     "gbus_int_handler",
                                     &gint_num_active_irqs[gint]);
                if (rval != 0)

diff --git a/arch/v850/kernel/rte_me2_cb.c b/arch/v850/kernel/rte_me2_cb.c
index df7027d854375cad745b4b4337757dd688eaa7c3..3be355a029e27766c21f823661b435a524d06277 100644 (file)
--- a/arch/v850/kernel/rte_me2_cb.c
+++ b/arch/v850/kernel/rte_me2_cb.c
@@ -263,7 +263,7 @@ static unsigned cb_pic_startup_irq (unsigned irq)
 
        if (cb_pic_active_irqs == 0) {
                rval = request_irq (IRQ_CB_PIC, cb_pic_handle_irq,
-                                   SA_INTERRUPT, "cb_pic_handler", 0);
+                                   IRQF_DISABLED, "cb_pic_handler", 0);
                if (rval != 0)
                        return rval;
        }

diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c
index c1e85c2aef65093f0ae70c90d8f1efc893e1e1b3..a0b46695f186f03921a7a09b66cde5af0bf5bfa8 100644 (file)
--- a/arch/v850/kernel/time.c
+++ b/arch/v850/kernel/time.c
@@ -177,7 +177,7 @@ EXPORT_SYMBOL(do_settimeofday);
 static int timer_dev_id;
 static struct irqaction timer_irqaction = {
        timer_interrupt,
-       SA_INTERRUPT,
+       IRQF_DISABLED,
        CPU_MASK_NONE,
        "timer",
        &timer_dev_id,

diff --git a/include/asm-v850/signal.h b/include/asm-v850/signal.h
index cb52caa69925b4ae669675c605456df4bfd02a3a..a38df0834bbffc7c4e830613a4820c912d415dc1 100644 (file)
--- a/include/asm-v850/signal.h
+++ b/include/asm-v850/signal.h
@@ -77,7 +77,6 @@ typedef unsigned long sigset_t;
  * SA_FLAGS values:
  *
  * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
  * SA_RESTART flag to get restarting signals (which were the default long ago)
  * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
  * SA_RESETHAND clears the handler when the signal is delivered.
@@ -97,7 +96,6 @@ typedef unsigned long sigset_t;
 
 #define SA_NOMASK      SA_NODEFER
 #define SA_ONESHOT     SA_RESETHAND
-#define SA_INTERRUPT   0x20000000 /* dummy -- ignored */
 
 #define SA_RESTORER    0x04000000