aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 11:53:26 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 11:53:26 -0400
commit65fc471343acbab05e2e24ad9688af43a37d6a1b (patch)
tree9911274b04db7f248405c579ce2231dc57aa4776 /include
parentccaa36f73544163ef6e15eb29a620130755f6001 (diff)
parent94e45a2b87bde64fd2eb170999da2fd2c5b04d28 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Update defconfig. [SPARC64]: Do not include compat.h from asm-sparc64/signal.h any more. [SPARC64]: Move signal compat bits to new header file.
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/compat_signal.h30
-rw-r--r--include/asm-sparc64/signal.h42
2 files changed, 34 insertions, 38 deletions
diff --git a/include/asm-sparc64/compat_signal.h b/include/asm-sparc64/compat_signal.h
new file mode 100644
index 000000000000..7aefa301321e
--- /dev/null
+++ b/include/asm-sparc64/compat_signal.h
@@ -0,0 +1,30 @@
1#ifndef _COMPAT_SIGNAL_H
2#define _COMPAT_SIGNAL_H
3
4#include <linux/config.h>
5#include <linux/compat.h>
6#include <asm/signal.h>
7
8#ifdef CONFIG_COMPAT
9struct __new_sigaction32 {
10 unsigned sa_handler;
11 unsigned int sa_flags;
12 unsigned sa_restorer; /* not used by Linux/SPARC yet */
13 compat_sigset_t sa_mask;
14};
15
16struct __old_sigaction32 {
17 unsigned sa_handler;
18 compat_old_sigset_t sa_mask;
19 unsigned int sa_flags;
20 unsigned sa_restorer; /* not used by Linux/SPARC yet */
21};
22
23typedef struct sigaltstack32 {
24 u32 ss_sp;
25 int ss_flags;
26 compat_size_t ss_size;
27} stack_t32;
28#endif
29
30#endif /* !(_COMPAT_SIGNAL_H) */
diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h
index 9968871103bc..fa6f467389db 100644
--- a/include/asm-sparc64/signal.h
+++ b/include/asm-sparc64/signal.h
@@ -8,7 +8,6 @@
8#ifndef __ASSEMBLY__ 8#ifndef __ASSEMBLY__
9#include <linux/personality.h> 9#include <linux/personality.h>
10#include <linux/types.h> 10#include <linux/types.h>
11#include <linux/compat.h>
12#endif 11#endif
13#endif 12#endif
14 13
@@ -167,23 +166,6 @@ struct __new_sigaction {
167 __new_sigset_t sa_mask; 166 __new_sigset_t sa_mask;
168}; 167};
169 168
170#ifdef __KERNEL__
171
172#ifdef CONFIG_COMPAT
173struct __new_sigaction32 {
174 unsigned sa_handler;
175 unsigned int sa_flags;
176 unsigned sa_restorer; /* not used by Linux/SPARC yet */
177 compat_sigset_t sa_mask;
178};
179#endif
180
181struct k_sigaction {
182 struct __new_sigaction sa;
183 void __user *ka_restorer;
184};
185#endif
186
187struct __old_sigaction { 169struct __old_sigaction {
188 __sighandler_t sa_handler; 170 __sighandler_t sa_handler;
189 __old_sigset_t sa_mask; 171 __old_sigset_t sa_mask;
@@ -191,19 +173,6 @@ struct __old_sigaction {
191 void (*sa_restorer)(void); /* not used by Linux/SPARC yet */ 173 void (*sa_restorer)(void); /* not used by Linux/SPARC yet */
192}; 174};
193 175
194#ifdef __KERNEL__
195
196#ifdef CONFIG_COMPAT
197struct __old_sigaction32 {
198 unsigned sa_handler;
199 compat_old_sigset_t sa_mask;
200 unsigned int sa_flags;
201 unsigned sa_restorer; /* not used by Linux/SPARC yet */
202};
203#endif
204
205#endif
206
207typedef struct sigaltstack { 176typedef struct sigaltstack {
208 void __user *ss_sp; 177 void __user *ss_sp;
209 int ss_flags; 178 int ss_flags;
@@ -212,13 +181,10 @@ typedef struct sigaltstack {
212 181
213#ifdef __KERNEL__ 182#ifdef __KERNEL__
214 183
215#ifdef CONFIG_COMPAT 184struct k_sigaction {
216typedef struct sigaltstack32 { 185 struct __new_sigaction sa;
217 u32 ss_sp; 186 void __user *ka_restorer;
218 int ss_flags; 187};
219 compat_size_t ss_size;
220} stack_t32;
221#endif
222 188
223struct signal_deliver_cookie { 189struct signal_deliver_cookie {
224 int restart_syscall; 190 int restart_syscall;