diff options
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/compat_signal.h | 6 | ||||
-rw-r--r-- | arch/sparc/include/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/sparc/include/asm/unistd.h | 3 | ||||
-rw-r--r-- | arch/sparc/include/uapi/asm/signal.h | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/arch/sparc/include/asm/compat_signal.h b/arch/sparc/include/asm/compat_signal.h index b759eab9b51c..9ed1f128b4d1 100644 --- a/arch/sparc/include/asm/compat_signal.h +++ b/arch/sparc/include/asm/compat_signal.h | |||
@@ -18,12 +18,6 @@ struct __old_sigaction32 { | |||
18 | unsigned int sa_flags; | 18 | unsigned int sa_flags; |
19 | unsigned sa_restorer; /* not used by Linux/SPARC yet */ | 19 | unsigned sa_restorer; /* not used by Linux/SPARC yet */ |
20 | }; | 20 | }; |
21 | |||
22 | typedef struct sigaltstack32 { | ||
23 | u32 ss_sp; | ||
24 | int ss_flags; | ||
25 | compat_size_t ss_size; | ||
26 | } stack_t32; | ||
27 | #endif | 21 | #endif |
28 | 22 | ||
29 | #endif /* !(_COMPAT_SIGNAL_H) */ | 23 | #endif /* !(_COMPAT_SIGNAL_H) */ |
diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h index 77b85850d543..c33ce3f2ba84 100644 --- a/arch/sparc/include/asm/signal.h +++ b/arch/sparc/include/asm/signal.h | |||
@@ -21,10 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | #define SA_STATIC_ALLOC 0x8000 | 22 | #define SA_STATIC_ALLOC 0x8000 |
23 | 23 | ||
24 | struct k_sigaction { | 24 | #define __ARCH_HAS_KA_RESTORER |
25 | struct __new_sigaction sa; | 25 | #define __ARCH_HAS_SA_RESTORER |
26 | void __user *ka_restorer; | ||
27 | }; | ||
28 | 26 | ||
29 | #endif /* !(__ASSEMBLY__) */ | 27 | #endif /* !(__ASSEMBLY__) */ |
30 | #endif /* !(__SPARC_SIGNAL_H) */ | 28 | #endif /* !(__SPARC_SIGNAL_H) */ |
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h index 87ce24c5eb95..5356810bd7e7 100644 --- a/arch/sparc/include/asm/unistd.h +++ b/arch/sparc/include/asm/unistd.h | |||
@@ -38,14 +38,11 @@ | |||
38 | #define __ARCH_WANT_SYS_OLDUMOUNT | 38 | #define __ARCH_WANT_SYS_OLDUMOUNT |
39 | #define __ARCH_WANT_SYS_SIGPENDING | 39 | #define __ARCH_WANT_SYS_SIGPENDING |
40 | #define __ARCH_WANT_SYS_SIGPROCMASK | 40 | #define __ARCH_WANT_SYS_SIGPROCMASK |
41 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | ||
42 | #ifdef __32bit_syscall_numbers__ | 41 | #ifdef __32bit_syscall_numbers__ |
43 | #define __ARCH_WANT_SYS_IPC | 42 | #define __ARCH_WANT_SYS_IPC |
44 | #else | 43 | #else |
45 | #define __ARCH_WANT_COMPAT_SYS_TIME | 44 | #define __ARCH_WANT_COMPAT_SYS_TIME |
46 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND | ||
47 | #define __ARCH_WANT_COMPAT_SYS_SENDFILE | 45 | #define __ARCH_WANT_COMPAT_SYS_SENDFILE |
48 | #define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL | ||
49 | #endif | 46 | #endif |
50 | 47 | ||
51 | /* | 48 | /* |
diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h index c4ffd6c97106..f387400fcfdf 100644 --- a/arch/sparc/include/uapi/asm/signal.h +++ b/arch/sparc/include/uapi/asm/signal.h | |||
@@ -153,6 +153,7 @@ struct sigstack { | |||
153 | 153 | ||
154 | #include <asm-generic/signal-defs.h> | 154 | #include <asm-generic/signal-defs.h> |
155 | 155 | ||
156 | #ifndef __KERNEL__ | ||
156 | struct __new_sigaction { | 157 | struct __new_sigaction { |
157 | __sighandler_t sa_handler; | 158 | __sighandler_t sa_handler; |
158 | unsigned long sa_flags; | 159 | unsigned long sa_flags; |
@@ -166,6 +167,7 @@ struct __old_sigaction { | |||
166 | unsigned long sa_flags; | 167 | unsigned long sa_flags; |
167 | void (*sa_restorer)(void); /* not used by Linux/SPARC yet */ | 168 | void (*sa_restorer)(void); /* not used by Linux/SPARC yet */ |
168 | }; | 169 | }; |
170 | #endif | ||
169 | 171 | ||
170 | typedef struct sigaltstack { | 172 | typedef struct sigaltstack { |
171 | void __user *ss_sp; | 173 | void __user *ss_sp; |