Commit 8b91fbb8338bae702f5a6c984fb05f1a01f6590c

Authored by Thomas Gleixner
Committed by Linus Torvalds
1 parent bd6aa6502e

[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>

Showing 4 changed files with 3 additions and 5 deletions Side-by-side Diff

arch/v850/kernel/gbus_int.c
... ... @@ -154,7 +154,7 @@
154 154 /* First enable the CPU interrupt. */
155 155 int rval =
156 156 request_irq (IRQ_GINT(gint), gbus_int_handle_irq,
157   - SA_INTERRUPT,
  157 + IRQF_DISABLED,
158 158 "gbus_int_handler",
159 159 &gint_num_active_irqs[gint]);
160 160 if (rval != 0)
arch/v850/kernel/rte_me2_cb.c
... ... @@ -263,7 +263,7 @@
263 263  
264 264 if (cb_pic_active_irqs == 0) {
265 265 rval = request_irq (IRQ_CB_PIC, cb_pic_handle_irq,
266   - SA_INTERRUPT, "cb_pic_handler", 0);
  266 + IRQF_DISABLED, "cb_pic_handler", 0);
267 267 if (rval != 0)
268 268 return rval;
269 269 }
arch/v850/kernel/time.c
... ... @@ -177,7 +177,7 @@
177 177 static int timer_dev_id;
178 178 static struct irqaction timer_irqaction = {
179 179 timer_interrupt,
180   - SA_INTERRUPT,
  180 + IRQF_DISABLED,
181 181 CPU_MASK_NONE,
182 182 "timer",
183 183 &timer_dev_id,
include/asm-v850/signal.h
... ... @@ -77,7 +77,6 @@
77 77 * SA_FLAGS values:
78 78 *
79 79 * SA_ONSTACK indicates that a registered stack_t will be used.
80   - * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
81 80 * SA_RESTART flag to get restarting signals (which were the default long ago)
82 81 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
83 82 * SA_RESETHAND clears the handler when the signal is delivered.
... ... @@ -97,7 +96,6 @@
97 96  
98 97 #define SA_NOMASK SA_NODEFER
99 98 #define SA_ONESHOT SA_RESETHAND
100   -#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */
101 99  
102 100 #define SA_RESTORER 0x04000000
103 101