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 /include | |
| 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 'include')
| -rw-r--r-- | include/asm-generic/syscalls.h | 5 | ||||
| -rw-r--r-- | include/linux/syscalls.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h index 1db51b8524e9..6a8d620a84d4 100644 --- a/include/asm-generic/syscalls.h +++ b/include/asm-generic/syscalls.h | |||
| @@ -36,9 +36,4 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs); | |||
| 36 | asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize); | 36 | asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize); |
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | #ifndef sys_rt_sigaction | ||
| 40 | asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act, | ||
| 41 | struct sigaction __user *oact, size_t sigsetsize); | ||
| 42 | #endif | ||
| 43 | |||
| 44 | #endif /* __ASM_GENERIC_SYSCALLS_H */ | 39 | #endif /* __ASM_GENERIC_SYSCALLS_H */ |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 45e2db270255..75defcd1c276 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -377,6 +377,12 @@ asmlinkage long sys_init_module(void __user *umod, unsigned long len, | |||
| 377 | asmlinkage long sys_delete_module(const char __user *name_user, | 377 | asmlinkage long sys_delete_module(const char __user *name_user, |
| 378 | unsigned int flags); | 378 | unsigned int flags); |
| 379 | 379 | ||
| 380 | #ifndef CONFIG_ODD_RT_SIGACTION | ||
| 381 | asmlinkage long sys_rt_sigaction(int, | ||
| 382 | const struct sigaction __user *, | ||
| 383 | struct sigaction __user *, | ||
| 384 | size_t); | ||
| 385 | #endif | ||
| 380 | asmlinkage long sys_rt_sigprocmask(int how, sigset_t __user *set, | 386 | asmlinkage long sys_rt_sigprocmask(int how, sigset_t __user *set, |
| 381 | sigset_t __user *oset, size_t sigsetsize); | 387 | sigset_t __user *oset, size_t sigsetsize); |
| 382 | asmlinkage long sys_rt_sigpending(sigset_t __user *set, size_t sigsetsize); | 388 | asmlinkage long sys_rt_sigpending(sigset_t __user *set, size_t sigsetsize); |
