diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-m68knommu/irq.h | 4 | ||||
-rw-r--r-- | include/asm-m68knommu/signal.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-m68knommu/irq.h b/include/asm-m68knommu/irq.h index 53557274eef8..45e7a2fd1689 100644 --- a/include/asm-m68knommu/irq.h +++ b/include/asm-m68knommu/irq.h | |||
@@ -62,8 +62,8 @@ extern void (*mach_disable_irq)(unsigned int); | |||
62 | 62 | ||
63 | /* | 63 | /* |
64 | * various flags for request_irq() - the Amiga now uses the standard | 64 | * various flags for request_irq() - the Amiga now uses the standard |
65 | * mechanism like all other architectures - SA_INTERRUPT and SA_SHIRQ | 65 | * mechanism like all other architectures - IRQF_DISABLED and |
66 | * are your friends. | 66 | * IRQF_SHARED are your friends. |
67 | */ | 67 | */ |
68 | #define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */ | 68 | #define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */ |
69 | #define IRQ_FLG_REPLACE (0x0002) /* replace existing handler */ | 69 | #define IRQ_FLG_REPLACE (0x0002) /* replace existing handler */ |
diff --git a/include/asm-m68knommu/signal.h b/include/asm-m68knommu/signal.h index 1d13187f6062..216c08be54a0 100644 --- a/include/asm-m68knommu/signal.h +++ b/include/asm-m68knommu/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. |
@@ -94,7 +93,6 @@ typedef unsigned long sigset_t; | |||
94 | 93 | ||
95 | #define SA_NOMASK SA_NODEFER | 94 | #define SA_NOMASK SA_NODEFER |
96 | #define SA_ONESHOT SA_RESETHAND | 95 | #define SA_ONESHOT SA_RESETHAND |
97 | #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ | ||
98 | 96 | ||
99 | /* | 97 | /* |
100 | * sigaltstack controls | 98 | * sigaltstack controls |