diff options
Diffstat (limited to 'include/asm-cris')
| -rw-r--r-- | include/asm-cris/arch-v10/irq.h | 2 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/irq.h | 2 | ||||
| -rw-r--r-- | include/asm-cris/signal.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-cris/arch-v10/irq.h b/include/asm-cris/arch-v10/irq.h index 4fa8945b0263..b1128a9984ae 100644 --- a/include/asm-cris/arch-v10/irq.h +++ b/include/asm-cris/arch-v10/irq.h | |||
| @@ -141,7 +141,7 @@ __asm__ ( \ | |||
| 141 | * it here, we would not get the multiple_irq at all. | 141 | * it here, we would not get the multiple_irq at all. |
| 142 | * | 142 | * |
| 143 | * The non-blocking here is based on the knowledge that the timer interrupt is | 143 | * The non-blocking here is based on the knowledge that the timer interrupt is |
| 144 | * registred as a fast interrupt (SA_INTERRUPT) so that we _know_ there will not | 144 | * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not |
| 145 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. | 145 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. |
| 146 | */ | 146 | */ |
| 147 | 147 | ||
diff --git a/include/asm-cris/arch-v32/irq.h b/include/asm-cris/arch-v32/irq.h index eeb0a80262c8..bac94ee6bc90 100644 --- a/include/asm-cris/arch-v32/irq.h +++ b/include/asm-cris/arch-v32/irq.h | |||
| @@ -98,7 +98,7 @@ __asm__ ( \ | |||
| 98 | * if we had BLOCK'edit here, we would not get the multiple_irq at all. | 98 | * if we had BLOCK'edit here, we would not get the multiple_irq at all. |
| 99 | * | 99 | * |
| 100 | * The non-blocking here is based on the knowledge that the timer interrupt is | 100 | * The non-blocking here is based on the knowledge that the timer interrupt is |
| 101 | * registred as a fast interrupt (SA_INTERRUPT) so that we _know_ there will not | 101 | * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not |
| 102 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. | 102 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. |
| 103 | */ | 103 | */ |
| 104 | #define BUILD_TIMER_IRQ(nr, mask) \ | 104 | #define BUILD_TIMER_IRQ(nr, mask) \ |
diff --git a/include/asm-cris/signal.h b/include/asm-cris/signal.h index dfe039593a78..349ae682b568 100644 --- a/include/asm-cris/signal.h +++ b/include/asm-cris/signal.h | |||
| @@ -74,7 +74,6 @@ typedef unsigned long sigset_t; | |||
| 74 | * SA_FLAGS values: | 74 | * SA_FLAGS values: |
| 75 | * | 75 | * |
| 76 | * SA_ONSTACK indicates that a registered stack_t will be used. | 76 | * SA_ONSTACK indicates that a registered stack_t will be used. |
| 77 | * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the | ||
| 78 | * SA_RESTART flag to get restarting signals (which were the default long ago) | 77 | * SA_RESTART flag to get restarting signals (which were the default long ago) |
| 79 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. | 78 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. |
| 80 | * SA_RESETHAND clears the handler when the signal is delivered. | 79 | * SA_RESETHAND clears the handler when the signal is delivered. |
| @@ -95,7 +94,6 @@ typedef unsigned long sigset_t; | |||
| 95 | 94 | ||
| 96 | #define SA_NOMASK SA_NODEFER | 95 | #define SA_NOMASK SA_NODEFER |
| 97 | #define SA_ONESHOT SA_RESETHAND | 96 | #define SA_ONESHOT SA_RESETHAND |
| 98 | #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ | ||
| 99 | 97 | ||
| 100 | #define SA_RESTORER 0x04000000 | 98 | #define SA_RESTORER 0x04000000 |
| 101 | 99 | ||