diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:48 -0400 |
commit | 8b91fbb8338bae702f5a6c984fb05f1a01f6590c (patch) | |
tree | 355beffd70984e9c355bafc782f1a6fa51ed7387 /arch/v850 | |
parent | bd6aa6502e7f82c39090aea29e4b644c29e720bd (diff) |
[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>
Diffstat (limited to 'arch/v850')
-rw-r--r-- | arch/v850/kernel/gbus_int.c | 2 | ||||
-rw-r--r-- | arch/v850/kernel/rte_me2_cb.c | 2 | ||||
-rw-r--r-- | arch/v850/kernel/time.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/v850/kernel/gbus_int.c b/arch/v850/kernel/gbus_int.c index 92918b8d89ef..25d636e79e6a 100644 --- 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) | |||
154 | /* First enable the CPU interrupt. */ | 154 | /* First enable the CPU interrupt. */ |
155 | int rval = | 155 | int rval = |
156 | request_irq (IRQ_GINT(gint), gbus_int_handle_irq, | 156 | request_irq (IRQ_GINT(gint), gbus_int_handle_irq, |
157 | SA_INTERRUPT, | 157 | IRQF_DISABLED, |
158 | "gbus_int_handler", | 158 | "gbus_int_handler", |
159 | &gint_num_active_irqs[gint]); | 159 | &gint_num_active_irqs[gint]); |
160 | if (rval != 0) | 160 | if (rval != 0) |
diff --git a/arch/v850/kernel/rte_me2_cb.c b/arch/v850/kernel/rte_me2_cb.c index df7027d85437..3be355a029e2 100644 --- 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) | |||
263 | 263 | ||
264 | if (cb_pic_active_irqs == 0) { | 264 | if (cb_pic_active_irqs == 0) { |
265 | rval = request_irq (IRQ_CB_PIC, cb_pic_handle_irq, | 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 | if (rval != 0) | 267 | if (rval != 0) |
268 | return rval; | 268 | return rval; |
269 | } | 269 | } |
diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c index c1e85c2aef65..a0b46695f186 100644 --- a/arch/v850/kernel/time.c +++ b/arch/v850/kernel/time.c | |||
@@ -177,7 +177,7 @@ EXPORT_SYMBOL(do_settimeofday); | |||
177 | static int timer_dev_id; | 177 | static int timer_dev_id; |
178 | static struct irqaction timer_irqaction = { | 178 | static struct irqaction timer_irqaction = { |
179 | timer_interrupt, | 179 | timer_interrupt, |
180 | SA_INTERRUPT, | 180 | IRQF_DISABLED, |
181 | CPU_MASK_NONE, | 181 | CPU_MASK_NONE, |
182 | "timer", | 182 | "timer", |
183 | &timer_dev_id, | 183 | &timer_dev_id, |