Commit aff60147049c0be346909ee2e1dbe600a5c7aa91

Authored by Thomas Gleixner
Committed by Linus Torvalds
1 parent 121a4226e8

[PATCH] irq-flags: M32R: 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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 1 additions and 3 deletions Side-by-side Diff

arch/m32r/kernel/time.c
... ... @@ -237,7 +237,7 @@
237 237 return IRQ_HANDLED;
238 238 }
239 239  
240   -struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE,
  240 +struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE,
241 241 "MFT2", NULL, NULL };
242 242  
243 243 void __init time_init(void)
include/asm-m32r/signal.h
... ... @@ -81,7 +81,6 @@
81 81 * SA_FLAGS values:
82 82 *
83 83 * SA_ONSTACK indicates that a registered stack_t will be used.
84   - * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
85 84 * SA_RESTART flag to get restarting signals (which were the default long ago)
86 85 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
87 86 * SA_RESETHAND clears the handler when the signal is delivered.
... ... @@ -101,7 +100,6 @@
101 100  
102 101 #define SA_NOMASK SA_NODEFER
103 102 #define SA_ONESHOT SA_RESETHAND
104   -#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */
105 103  
106 104 #define SA_RESTORER 0x04000000
107 105