diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-18 15:13:17 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-19 18:07:39 -0500 |
commit | 031b6566983ad9c0247087f039af22b3f87596a3 (patch) | |
tree | ee0048a5cdf97aa53cad4933a6968826bfac6bf4 | |
parent | 1ca97bb541a1f5a735e697a8bba763cde3aab452 (diff) |
unify SS_ONSTACK/SS_DISABLE definitions
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/alpha/include/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/arm/include/uapi/asm/signal.h | 7 | ||||
-rw-r--r-- | arch/avr32/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/cris/include/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/h8300/include/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/ia64/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/m32r/include/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/m68k/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/mips/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/mn10300/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/parisc/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/powerpc/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/s390/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/sparc/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/xtensa/include/uapi/asm/signal.h | 6 | ||||
-rw-r--r-- | include/uapi/asm-generic/signal.h | 6 | ||||
-rw-r--r-- | include/uapi/linux/signal.h | 2 |
18 files changed, 2 insertions, 103 deletions
diff --git a/arch/alpha/include/asm/signal.h b/arch/alpha/include/asm/signal.h index 45552862cc10..a9aa0133f656 100644 --- a/arch/alpha/include/asm/signal.h +++ b/arch/alpha/include/asm/signal.h | |||
@@ -98,12 +98,6 @@ typedef unsigned long sigset_t; | |||
98 | #define SA_ONESHOT SA_RESETHAND | 98 | #define SA_ONESHOT SA_RESETHAND |
99 | #define SA_NOMASK SA_NODEFER | 99 | #define SA_NOMASK SA_NODEFER |
100 | 100 | ||
101 | /* | ||
102 | * sigaltstack controls | ||
103 | */ | ||
104 | #define SS_ONSTACK 1 | ||
105 | #define SS_DISABLE 2 | ||
106 | |||
107 | #define MINSIGSTKSZ 4096 | 101 | #define MINSIGSTKSZ 4096 |
108 | #define SIGSTKSZ 16384 | 102 | #define SIGSTKSZ 16384 |
109 | 103 | ||
diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h index 921c57fdc52e..33073bdcf091 100644 --- a/arch/arm/include/uapi/asm/signal.h +++ b/arch/arm/include/uapi/asm/signal.h | |||
@@ -87,13 +87,6 @@ typedef unsigned long sigset_t; | |||
87 | #define SA_NOMASK SA_NODEFER | 87 | #define SA_NOMASK SA_NODEFER |
88 | #define SA_ONESHOT SA_RESETHAND | 88 | #define SA_ONESHOT SA_RESETHAND |
89 | 89 | ||
90 | |||
91 | /* | ||
92 | * sigaltstack controls | ||
93 | */ | ||
94 | #define SS_ONSTACK 1 | ||
95 | #define SS_DISABLE 2 | ||
96 | |||
97 | #define MINSIGSTKSZ 2048 | 90 | #define MINSIGSTKSZ 2048 |
98 | #define SIGSTKSZ 8192 | 91 | #define SIGSTKSZ 8192 |
99 | 92 | ||
diff --git a/arch/avr32/include/uapi/asm/signal.h b/arch/avr32/include/uapi/asm/signal.h index eb46f61adb7d..1b77a93eff50 100644 --- a/arch/avr32/include/uapi/asm/signal.h +++ b/arch/avr32/include/uapi/asm/signal.h | |||
@@ -89,12 +89,6 @@ typedef unsigned long sigset_t; | |||
89 | #define SA_NOMASK SA_NODEFER | 89 | #define SA_NOMASK SA_NODEFER |
90 | #define SA_ONESHOT SA_RESETHAND | 90 | #define SA_ONESHOT SA_RESETHAND |
91 | 91 | ||
92 | /* | ||
93 | * sigaltstack controls | ||
94 | */ | ||
95 | #define SS_ONSTACK 1 | ||
96 | #define SS_DISABLE 2 | ||
97 | |||
98 | #define MINSIGSTKSZ 2048 | 92 | #define MINSIGSTKSZ 2048 |
99 | #define SIGSTKSZ 8192 | 93 | #define SIGSTKSZ 8192 |
100 | 94 | ||
diff --git a/arch/cris/include/asm/signal.h b/arch/cris/include/asm/signal.h index 72dbbf59dfae..fdbffb773d81 100644 --- a/arch/cris/include/asm/signal.h +++ b/arch/cris/include/asm/signal.h | |||
@@ -97,12 +97,6 @@ typedef unsigned long sigset_t; | |||
97 | 97 | ||
98 | #define SA_RESTORER 0x04000000 | 98 | #define SA_RESTORER 0x04000000 |
99 | 99 | ||
100 | /* | ||
101 | * sigaltstack controls | ||
102 | */ | ||
103 | #define SS_ONSTACK 1 | ||
104 | #define SS_DISABLE 2 | ||
105 | |||
106 | #define MINSIGSTKSZ 2048 | 100 | #define MINSIGSTKSZ 2048 |
107 | #define SIGSTKSZ 8192 | 101 | #define SIGSTKSZ 8192 |
108 | 102 | ||
diff --git a/arch/h8300/include/asm/signal.h b/arch/h8300/include/asm/signal.h index c43c0a7d2c2e..575c79a008f4 100644 --- a/arch/h8300/include/asm/signal.h +++ b/arch/h8300/include/asm/signal.h | |||
@@ -96,12 +96,6 @@ typedef unsigned long sigset_t; | |||
96 | 96 | ||
97 | #define SA_RESTORER 0x04000000 | 97 | #define SA_RESTORER 0x04000000 |
98 | 98 | ||
99 | /* | ||
100 | * sigaltstack controls | ||
101 | */ | ||
102 | #define SS_ONSTACK 1 | ||
103 | #define SS_DISABLE 2 | ||
104 | |||
105 | #define MINSIGSTKSZ 2048 | 99 | #define MINSIGSTKSZ 2048 |
106 | #define SIGSTKSZ 8192 | 100 | #define SIGSTKSZ 8192 |
107 | 101 | ||
diff --git a/arch/ia64/include/uapi/asm/signal.h b/arch/ia64/include/uapi/asm/signal.h index e531c424434c..c0ea2855e96b 100644 --- a/arch/ia64/include/uapi/asm/signal.h +++ b/arch/ia64/include/uapi/asm/signal.h | |||
@@ -79,12 +79,6 @@ | |||
79 | #define SA_RESTORER 0x04000000 | 79 | #define SA_RESTORER 0x04000000 |
80 | 80 | ||
81 | /* | 81 | /* |
82 | * sigaltstack controls | ||
83 | */ | ||
84 | #define SS_ONSTACK 1 | ||
85 | #define SS_DISABLE 2 | ||
86 | |||
87 | /* | ||
88 | * The minimum stack size needs to be fairly large because we want to | 82 | * The minimum stack size needs to be fairly large because we want to |
89 | * be sure that an app compiled for today's CPUs will continue to run | 83 | * be sure that an app compiled for today's CPUs will continue to run |
90 | * on all future CPU models. The CPU model matters because the signal | 84 | * on all future CPU models. The CPU model matters because the signal |
diff --git a/arch/m32r/include/asm/signal.h b/arch/m32r/include/asm/signal.h index e4d2e2ad5f1e..ba714c45259d 100644 --- a/arch/m32r/include/asm/signal.h +++ b/arch/m32r/include/asm/signal.h | |||
@@ -98,12 +98,6 @@ typedef unsigned long sigset_t; | |||
98 | 98 | ||
99 | #define SA_RESTORER 0x04000000 | 99 | #define SA_RESTORER 0x04000000 |
100 | 100 | ||
101 | /* | ||
102 | * sigaltstack controls | ||
103 | */ | ||
104 | #define SS_ONSTACK 1 | ||
105 | #define SS_DISABLE 2 | ||
106 | |||
107 | #define MINSIGSTKSZ 2048 | 101 | #define MINSIGSTKSZ 2048 |
108 | #define SIGSTKSZ 8192 | 102 | #define SIGSTKSZ 8192 |
109 | 103 | ||
diff --git a/arch/m68k/include/uapi/asm/signal.h b/arch/m68k/include/uapi/asm/signal.h index 2b450f311bd9..cba6f858bb46 100644 --- a/arch/m68k/include/uapi/asm/signal.h +++ b/arch/m68k/include/uapi/asm/signal.h | |||
@@ -80,12 +80,6 @@ typedef unsigned long sigset_t; | |||
80 | #define SA_NOMASK SA_NODEFER | 80 | #define SA_NOMASK SA_NODEFER |
81 | #define SA_ONESHOT SA_RESETHAND | 81 | #define SA_ONESHOT SA_RESETHAND |
82 | 82 | ||
83 | /* | ||
84 | * sigaltstack controls | ||
85 | */ | ||
86 | #define SS_ONSTACK 1 | ||
87 | #define SS_DISABLE 2 | ||
88 | |||
89 | #define MINSIGSTKSZ 2048 | 83 | #define MINSIGSTKSZ 2048 |
90 | #define SIGSTKSZ 8192 | 84 | #define SIGSTKSZ 8192 |
91 | 85 | ||
diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h index 3f1237c6c80e..770732cb8d03 100644 --- a/arch/mips/include/uapi/asm/signal.h +++ b/arch/mips/include/uapi/asm/signal.h | |||
@@ -86,12 +86,6 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ | |||
86 | 86 | ||
87 | #define SA_RESTORER 0x04000000 /* Only for o32 */ | 87 | #define SA_RESTORER 0x04000000 /* Only for o32 */ |
88 | 88 | ||
89 | /* | ||
90 | * sigaltstack controls | ||
91 | */ | ||
92 | #define SS_ONSTACK 1 | ||
93 | #define SS_DISABLE 2 | ||
94 | |||
95 | #define MINSIGSTKSZ 2048 | 89 | #define MINSIGSTKSZ 2048 |
96 | #define SIGSTKSZ 8192 | 90 | #define SIGSTKSZ 8192 |
97 | 91 | ||
diff --git a/arch/mn10300/include/uapi/asm/signal.h b/arch/mn10300/include/uapi/asm/signal.h index 08dcd6a85618..f423a08d7eeb 100644 --- a/arch/mn10300/include/uapi/asm/signal.h +++ b/arch/mn10300/include/uapi/asm/signal.h | |||
@@ -92,12 +92,6 @@ typedef unsigned long sigset_t; | |||
92 | 92 | ||
93 | #define SA_RESTORER 0x04000000 | 93 | #define SA_RESTORER 0x04000000 |
94 | 94 | ||
95 | /* | ||
96 | * sigaltstack controls | ||
97 | */ | ||
98 | #define SS_ONSTACK 1 | ||
99 | #define SS_DISABLE 2 | ||
100 | |||
101 | #define MINSIGSTKSZ 2048 | 95 | #define MINSIGSTKSZ 2048 |
102 | #define SIGSTKSZ 8192 | 96 | #define SIGSTKSZ 8192 |
103 | 97 | ||
diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index b1ddaa243376..a2fa297196bc 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h | |||
@@ -71,12 +71,6 @@ | |||
71 | 71 | ||
72 | #define SA_RESTORER 0x04000000 /* obsolete -- ignored */ | 72 | #define SA_RESTORER 0x04000000 /* obsolete -- ignored */ |
73 | 73 | ||
74 | /* | ||
75 | * sigaltstack controls | ||
76 | */ | ||
77 | #define SS_ONSTACK 1 | ||
78 | #define SS_DISABLE 2 | ||
79 | |||
80 | #define MINSIGSTKSZ 2048 | 74 | #define MINSIGSTKSZ 2048 |
81 | #define SIGSTKSZ 8192 | 75 | #define SIGSTKSZ 8192 |
82 | 76 | ||
diff --git a/arch/powerpc/include/uapi/asm/signal.h b/arch/powerpc/include/uapi/asm/signal.h index 48fa8d3f2f9a..e079fb39d5bc 100644 --- a/arch/powerpc/include/uapi/asm/signal.h +++ b/arch/powerpc/include/uapi/asm/signal.h | |||
@@ -85,12 +85,6 @@ typedef struct { | |||
85 | 85 | ||
86 | #define SA_RESTORER 0x04000000U | 86 | #define SA_RESTORER 0x04000000U |
87 | 87 | ||
88 | /* | ||
89 | * sigaltstack controls | ||
90 | */ | ||
91 | #define SS_ONSTACK 1 | ||
92 | #define SS_DISABLE 2 | ||
93 | |||
94 | #define MINSIGSTKSZ 2048 | 88 | #define MINSIGSTKSZ 2048 |
95 | #define SIGSTKSZ 8192 | 89 | #define SIGSTKSZ 8192 |
96 | 90 | ||
diff --git a/arch/s390/include/uapi/asm/signal.h b/arch/s390/include/uapi/asm/signal.h index 8c6a49e392ee..2f43cfbf5f1a 100644 --- a/arch/s390/include/uapi/asm/signal.h +++ b/arch/s390/include/uapi/asm/signal.h | |||
@@ -90,12 +90,6 @@ typedef unsigned long sigset_t; | |||
90 | 90 | ||
91 | #define SA_RESTORER 0x04000000 | 91 | #define SA_RESTORER 0x04000000 |
92 | 92 | ||
93 | /* | ||
94 | * sigaltstack controls | ||
95 | */ | ||
96 | #define SS_ONSTACK 1 | ||
97 | #define SS_DISABLE 2 | ||
98 | |||
99 | #define MINSIGSTKSZ 2048 | 93 | #define MINSIGSTKSZ 2048 |
100 | #define SIGSTKSZ 8192 | 94 | #define SIGSTKSZ 8192 |
101 | 95 | ||
diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h index 1a041892538f..c4ffd6c97106 100644 --- a/arch/sparc/include/uapi/asm/signal.h +++ b/arch/sparc/include/uapi/asm/signal.h | |||
@@ -147,12 +147,6 @@ struct sigstack { | |||
147 | #define SIG_UNBLOCK 0x02 /* for unblocking signals */ | 147 | #define SIG_UNBLOCK 0x02 /* for unblocking signals */ |
148 | #define SIG_SETMASK 0x04 /* for setting the signal mask */ | 148 | #define SIG_SETMASK 0x04 /* for setting the signal mask */ |
149 | 149 | ||
150 | /* | ||
151 | * sigaltstack controls | ||
152 | */ | ||
153 | #define SS_ONSTACK 1 | ||
154 | #define SS_DISABLE 2 | ||
155 | |||
156 | #define MINSIGSTKSZ 4096 | 150 | #define MINSIGSTKSZ 4096 |
157 | #define SIGSTKSZ 16384 | 151 | #define SIGSTKSZ 16384 |
158 | 152 | ||
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h index 0dba8b7a6ac7..7bb5490b3aa2 100644 --- a/arch/x86/include/asm/signal.h +++ b/arch/x86/include/asm/signal.h | |||
@@ -112,12 +112,6 @@ typedef unsigned long sigset_t; | |||
112 | 112 | ||
113 | #define SA_RESTORER 0x04000000 | 113 | #define SA_RESTORER 0x04000000 |
114 | 114 | ||
115 | /* | ||
116 | * sigaltstack controls | ||
117 | */ | ||
118 | #define SS_ONSTACK 1 | ||
119 | #define SS_DISABLE 2 | ||
120 | |||
121 | #define MINSIGSTKSZ 2048 | 115 | #define MINSIGSTKSZ 2048 |
122 | #define SIGSTKSZ 8192 | 116 | #define SIGSTKSZ 8192 |
123 | 117 | ||
diff --git a/arch/xtensa/include/uapi/asm/signal.h b/arch/xtensa/include/uapi/asm/signal.h index b88ce96f2af9..dacf716dd3e0 100644 --- a/arch/xtensa/include/uapi/asm/signal.h +++ b/arch/xtensa/include/uapi/asm/signal.h | |||
@@ -97,12 +97,6 @@ typedef struct { | |||
97 | 97 | ||
98 | #define SA_RESTORER 0x04000000 | 98 | #define SA_RESTORER 0x04000000 |
99 | 99 | ||
100 | /* | ||
101 | * sigaltstack controls | ||
102 | */ | ||
103 | #define SS_ONSTACK 1 | ||
104 | #define SS_DISABLE 2 | ||
105 | |||
106 | #define MINSIGSTKSZ 2048 | 100 | #define MINSIGSTKSZ 2048 |
107 | #define SIGSTKSZ 8192 | 101 | #define SIGSTKSZ 8192 |
108 | 102 | ||
diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h index 0a78028984de..6fae30fd16ab 100644 --- a/include/uapi/asm-generic/signal.h +++ b/include/uapi/asm-generic/signal.h | |||
@@ -80,12 +80,6 @@ | |||
80 | * SA_RESTORER 0x04000000 | 80 | * SA_RESTORER 0x04000000 |
81 | */ | 81 | */ |
82 | 82 | ||
83 | /* | ||
84 | * sigaltstack controls | ||
85 | */ | ||
86 | #define SS_ONSTACK 1 | ||
87 | #define SS_DISABLE 2 | ||
88 | |||
89 | #define MINSIGSTKSZ 2048 | 83 | #define MINSIGSTKSZ 2048 |
90 | #define SIGSTKSZ 8192 | 84 | #define SIGSTKSZ 8192 |
91 | 85 | ||
diff --git a/include/uapi/linux/signal.h b/include/uapi/linux/signal.h index dff452ed6d00..e1bd50c29ded 100644 --- a/include/uapi/linux/signal.h +++ b/include/uapi/linux/signal.h | |||
@@ -4,5 +4,7 @@ | |||
4 | #include <asm/signal.h> | 4 | #include <asm/signal.h> |
5 | #include <asm/siginfo.h> | 5 | #include <asm/siginfo.h> |
6 | 6 | ||
7 | #define SS_ONSTACK 1 | ||
8 | #define SS_DISABLE 2 | ||
7 | 9 | ||
8 | #endif /* _UAPI_LINUX_SIGNAL_H */ | 10 | #endif /* _UAPI_LINUX_SIGNAL_H */ |