Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <[email protected]>
arch/v850/kernel/gbus_int.c | 2 +-
arch/v850/kernel/rte_me2_cb.c | 2 +-
arch/v850/kernel/time.c | 2 +-
include/asm-v850/signal.h | 2 --
4 files changed, 3 insertions(+), 5 deletions(-)
Index: linux-2.6.git/include/asm-v850/signal.h
===================================================================
--- linux-2.6.git.orig/include/asm-v850/signal.h 2006-07-01 16:51:21.000000000 +0200
+++ linux-2.6.git/include/asm-v850/signal.h 2006-07-01 16:51:38.000000000 +0200
@@ -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
Index: linux-2.6.git/arch/v850/kernel/gbus_int.c
===================================================================
--- linux-2.6.git.orig/arch/v850/kernel/gbus_int.c 2006-07-01 16:51:21.000000000 +0200
+++ linux-2.6.git/arch/v850/kernel/gbus_int.c 2006-07-01 16:51:38.000000000 +0200
@@ -154,7 +154,7 @@ static unsigned gbus_int_startup_irq (un
/* 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)
Index: linux-2.6.git/arch/v850/kernel/rte_me2_cb.c
===================================================================
--- linux-2.6.git.orig/arch/v850/kernel/rte_me2_cb.c 2006-07-01 16:51:21.000000000 +0200
+++ linux-2.6.git/arch/v850/kernel/rte_me2_cb.c 2006-07-01 16:51:38.000000000 +0200
@@ -263,7 +263,7 @@ static unsigned cb_pic_startup_irq (unsi
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;
}
Index: linux-2.6.git/arch/v850/kernel/time.c
===================================================================
--- linux-2.6.git.orig/arch/v850/kernel/time.c 2006-07-01 16:51:21.000000000 +0200
+++ linux-2.6.git/arch/v850/kernel/time.c 2006-07-01 16:51:38.000000000 +0200
@@ -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,
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
