Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b91fbb8 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

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



Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: default avatarThomas 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bd6aa650

arch/v850/kernel/gbus_int.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/v850/kernel/rte_me2_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

arch/v850/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/asm-v850/signal.h

+0 −2
Original line number Diff line number Diff line
@@ -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