take sys_rt_sigsuspend() prototype to linux/syscalls.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h
index 21936530df089db12225c2aa133a01d6ef409749..6949c42ffac20a48d5ee503f0934a3eb725ec096 100644 (file)
--- a/arch/powerpc/include/asm/syscalls.h
+++ b/arch/powerpc/include/asm/syscalls.h
@@ -22,8 +22,6 @@ asmlinkage long ppc64_personality(unsigned long personality);
 asmlinkage int ppc_rtas(struct rtas_args __user *uargs);
 asmlinkage time_t sys64_time(time_t __user * tloc);
 
-asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset,
-               size_t sigsetsize);
 asmlinkage long sys_sigaltstack(const stack_t __user *uss,
                stack_t __user *uoss, unsigned long r5, unsigned long r6,
                unsigned long r7, unsigned long r8, struct pt_regs *regs);

diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 804e323c139d000fbc280742d9b1a6729271110e..9ec3fed3caaccc6693782c99c52caa94ea40e7ac 100644 (file)
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -57,7 +57,6 @@
 
 #ifdef CONFIG_PPC64
 #define sys_sigsuspend compat_sys_sigsuspend
-#define sys_rt_sigsuspend      compat_sys_rt_sigsuspend
 #define sys_rt_sigreturn       compat_sys_rt_sigreturn
 #define sys_sigaction  compat_sys_sigaction
 #define sys_swapcontext        compat_sys_swapcontext

diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/syscall.h
index 6cf7c6c07a84f5c913a2217eb4405be9fc367335..08a23ddac2954529c378c0cd15eb0abe08c7e08b 100644 (file)
--- a/arch/xtensa/include/asm/syscall.h
+++ b/arch/xtensa/include/asm/syscall.h
@@ -26,4 +26,3 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
                          struct timespec __user *tsp,
                          const sigset_t __user *sigmask,
                          size_t sigsetsize);
-asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize);

diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h
index 6a8d620a84d48e180fd000b8b8d06a1e2a08b176..9e25a3179d6cf431ac94cf36219a343403187959 100644 (file)
--- a/include/asm-generic/syscalls.h
+++ b/include/asm-generic/syscalls.h
@@ -32,8 +32,4 @@ asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *,
 asmlinkage long sys_rt_sigreturn(struct pt_regs *regs);
 #endif
 
-#ifndef sys_rt_sigsuspend
-asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize);
-#endif
-
 #endif /* __ASM_GENERIC_SYSCALLS_H */

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 02b04501278553f7acce379c864f3d8a5cb4c832..66d298f69f98b6e3c4116bb32a003cbadf9cdb47 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -385,6 +385,8 @@ asmlinkage long sys_sigsuspend(old_sigset_t mask);
 asmlinkage long sys_sigsuspend(int unused1, int unused2, old_sigset_t mask);
 #endif
 
+asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize);
+
 #ifdef CONFIG_OLD_SIGACTION
 asmlinkage long sys_sigaction(int, const struct old_sigaction __user *,
                                struct old_sigaction __user *);