diff options
-rw-r--r-- | arch/m32r/kernel/time.c | 2 | ||||
-rw-r--r-- | include/asm-m32r/signal.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index efff6f5151df..ded0be07a476 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) | |||
237 | return IRQ_HANDLED; | 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 | "MFT2", NULL, NULL }; | 241 | "MFT2", NULL, NULL }; |
242 | 242 | ||
243 | void __init time_init(void) | 243 | void __init time_init(void) |
diff --git a/include/asm-m32r/signal.h b/include/asm-m32r/signal.h index 95f69b191953..e750045164d4 100644 --- a/include/asm-m32r/signal.h +++ b/include/asm-m32r/signal.h | |||
@@ -81,7 +81,6 @@ typedef unsigned long sigset_t; | |||
81 | * SA_FLAGS values: | 81 | * SA_FLAGS values: |
82 | * | 82 | * |
83 | * SA_ONSTACK indicates that a registered stack_t will be used. | 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 | * SA_RESTART flag to get restarting signals (which were the default long ago) | 84 | * SA_RESTART flag to get restarting signals (which were the default long ago) |
86 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. | 85 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. |
87 | * SA_RESETHAND clears the handler when the signal is delivered. | 86 | * SA_RESETHAND clears the handler when the signal is delivered. |
@@ -101,7 +100,6 @@ typedef unsigned long sigset_t; | |||
101 | 100 | ||
102 | #define SA_NOMASK SA_NODEFER | 101 | #define SA_NOMASK SA_NODEFER |
103 | #define SA_ONESHOT SA_RESETHAND | 102 | #define SA_ONESHOT SA_RESETHAND |
104 | #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ | ||
105 | 103 | ||
106 | #define SA_RESTORER 0x04000000 | 104 | #define SA_RESTORER 0x04000000 |
107 | 105 | ||