Skip to content

Commit

Permalink
[PATCH] irq-flags: M32R: Use the new IRQF_ constants
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jul 2, 2006
1 parent 121a422 commit aff6014
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion arch/m32r/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}

struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE,
struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE,
"MFT2", NULL, NULL };

void __init time_init(void)
Expand Down
2 changes: 0 additions & 2 deletions include/asm-m32r/signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,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.
Expand All @@ -101,7 +100,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

Expand Down

0 comments on commit aff6014

Please sign in to comment.