projects/linux·commit aff60147

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

aff60147 · Thomas Gleixner <[email protected]> · 2006-07-01 19:29:18 -07:00

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
aff60147049c0be346909ee2e1dbe600a5c7aa91
Parents
121a4226

Changes

2 files changed · +1 −3

FileStatusAddDelContent
arch/m32r/kernel/time.cmodified+1−1View file
include/asm-m32r/signal.hmodified+0−2View file

arch/m32r/kernel/time.c

View file
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index efff6f5..ded0be0 100644
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
@@ -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)

include/asm-m32r/signal.h

View file
diff --git a/include/asm-m32r/signal.h b/include/asm-m32r/signal.h
index 95f69b1..e750045 100644
--- a/include/asm-m32r/signal.h
+++ b/include/asm-m32r/signal.h
@@ -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.
@@ -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