diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-22 01:16:34 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-21 23:58:06 -0400 |
| commit | 9ef461adf9875a0fcaafe4d152a7557740fa1a25 (patch) | |
| tree | 1d07dba7defbf39e67de2d38084b4b9ade9a3d98 /arch/sh/include | |
| parent | 9ccc9c75c9117d18a9b1f71a21f0066b1eb9db6f (diff) | |
| download | linux-9ef461adf9875a0fcaafe4d152a7557740fa1a25.tar.gz linux-9ef461adf9875a0fcaafe4d152a7557740fa1a25.tar.bz2 linux-9ef461adf9875a0fcaafe4d152a7557740fa1a25.zip | |
sh: switch to saved_sigmask-based sigsuspend()/rt_sigsuspend()
Complete the move of sh64 to it, trim the crap from prototypes,
tidy up a bit. Infrastructure in do_signal() had already been
there, in signal_64 as well as in signal_32 (where it was already
used).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/syscalls_32.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/unistd.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index ae717e3c26d6..6c1fa559753c 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@ -23,9 +23,7 @@ asmlinkage int sys_execve(const char __user *ufilename, const char __user *const __user *uargv, const char __user *const __user *uenvp, unsigned long r7, struct pt_regs __regs); -asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5, - unsigned long r6, unsigned long r7, - struct pt_regs __regs); +asmlinkage int sys_sigsuspend(old_sigset_t mask); asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction __user *oact); asmlinkage int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h index a42a5610a36a..e800a38c9f8d 100644 --- a/arch/sh/include/asm/unistd.h +++ b/arch/sh/include/asm/unistd.h @@ -1,13 +1,11 @@ #ifdef __KERNEL__ # ifdef CONFIG_SUPERH32 - # include "unistd_32.h" -# define __ARCH_WANT_SYS_RT_SIGSUSPEND - # else # include "unistd_64.h" # endif +# define __ARCH_WANT_SYS_RT_SIGSUSPEND # define __ARCH_WANT_IPC_PARSE_VERSION # define __ARCH_WANT_OLD_READDIR # define __ARCH_WANT_OLD_STAT |