diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-25 23:12:10 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 15:09:18 -0500 |
commit | eaca6eae3e0c41d41fcb9d1d70e00934988dff2e (patch) | |
tree | ad1fc38c1a76d2eadccb0cd591151b09a270fc57 /arch/sparc | |
parent | 377840744bea59aacd524f496dc577463f94584b (diff) |
sanitize rt_sigaction() situation a bit
Switch from __ARCH_WANT_SYS_RT_SIGACTION to opposite
(!CONFIG_ODD_RT_SIGACTION); the only two architectures that
need it are alpha and sparc. The reason for use of CONFIG_...
instead of __ARCH_... is that it's needed only kernel-side
and doing it that way avoids a mess with include order on many
architectures.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/Kconfig | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sys_sparc_32.c | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 9f2edb5c5551..89dde2f0653a 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -41,6 +41,7 @@ config SPARC | |||
41 | select GENERIC_STRNCPY_FROM_USER | 41 | select GENERIC_STRNCPY_FROM_USER |
42 | select GENERIC_STRNLEN_USER | 42 | select GENERIC_STRNLEN_USER |
43 | select MODULES_USE_ELF_RELA | 43 | select MODULES_USE_ELF_RELA |
44 | select ODD_RT_SIGACTION | ||
44 | 45 | ||
45 | config SPARC32 | 46 | config SPARC32 |
46 | def_bool !64BIT | 47 | def_bool !64BIT |
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c index 2da0bdcae52f..cdd2d7035930 100644 --- a/arch/sparc/kernel/sys_sparc_32.c +++ b/arch/sparc/kernel/sys_sparc_32.c | |||
@@ -197,12 +197,11 @@ sparc_sigaction (int sig, const struct old_sigaction __user *act, | |||
197 | return ret; | 197 | return ret; |
198 | } | 198 | } |
199 | 199 | ||
200 | asmlinkage long | 200 | SYSCALL_DEFINE5(rt_sigaction, int, sig, |
201 | sys_rt_sigaction(int sig, | 201 | const struct sigaction __user *, act, |
202 | const struct sigaction __user *act, | 202 | struct sigaction __user *, oact, |
203 | struct sigaction __user *oact, | 203 | void __user *, restorer, |
204 | void __user *restorer, | 204 | size_t, sigsetsize) |
205 | size_t sigsetsize) | ||
206 | { | 205 | { |
207 | struct k_sigaction new_ka, old_ka; | 206 | struct k_sigaction new_ka, old_ka; |
208 | int ret; | 207 | int ret; |