aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-25 02:30:08 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:14:23 -0500
commit0aa0203fb43f04714004b2c4ad33b858e240555d (patch)
treea20ef40fc2b066d08f8204e97fd7f297676883f2
parent709410a03e206c912e99b19dbb0e474aae6890cd (diff)
take sys_rt_sigsuspend() prototype to linux/syscalls.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/powerpc/include/asm/syscalls.h2
-rw-r--r--arch/powerpc/kernel/signal_32.c1
-rw-r--r--arch/xtensa/include/asm/syscall.h1
-rw-r--r--include/asm-generic/syscalls.h4
-rw-r--r--include/linux/syscalls.h2
5 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h
index 21936530df08..6949c42ffac2 100644
--- 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);
22asmlinkage int ppc_rtas(struct rtas_args __user *uargs); 22asmlinkage int ppc_rtas(struct rtas_args __user *uargs);
23asmlinkage time_t sys64_time(time_t __user * tloc); 23asmlinkage time_t sys64_time(time_t __user * tloc);
24 24
25asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset,
26 size_t sigsetsize);
27asmlinkage long sys_sigaltstack(const stack_t __user *uss, 25asmlinkage long sys_sigaltstack(const stack_t __user *uss,
28 stack_t __user *uoss, unsigned long r5, unsigned long r6, 26 stack_t __user *uoss, unsigned long r5, unsigned long r6,
29 unsigned long r7, unsigned long r8, struct pt_regs *regs); 27 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 804e323c139d..9ec3fed3caac 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -57,7 +57,6 @@
57 57
58#ifdef CONFIG_PPC64 58#ifdef CONFIG_PPC64
59#define sys_sigsuspend compat_sys_sigsuspend 59#define sys_sigsuspend compat_sys_sigsuspend
60#define sys_rt_sigsuspend compat_sys_rt_sigsuspend
61#define sys_rt_sigreturn compat_sys_rt_sigreturn 60#define sys_rt_sigreturn compat_sys_rt_sigreturn
62#define sys_sigaction compat_sys_sigaction 61#define sys_sigaction compat_sys_sigaction
63#define sys_swapcontext compat_sys_swapcontext 62#define sys_swapcontext compat_sys_swapcontext
diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/syscall.h
index 6cf7c6c07a84..08a23ddac295 100644
--- 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,
26 struct timespec __user *tsp, 26 struct timespec __user *tsp,
27 const sigset_t __user *sigmask, 27 const sigset_t __user *sigmask,
28 size_t sigsetsize); 28 size_t sigsetsize);
29asmlinkage 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 6a8d620a84d4..9e25a3179d6c 100644
--- 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 *,
32asmlinkage long sys_rt_sigreturn(struct pt_regs *regs); 32asmlinkage long sys_rt_sigreturn(struct pt_regs *regs);
33#endif 33#endif
34 34
35#ifndef sys_rt_sigsuspend
36asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize);
37#endif
38
39#endif /* __ASM_GENERIC_SYSCALLS_H */ 35#endif /* __ASM_GENERIC_SYSCALLS_H */
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 02b045012785..66d298f69f98 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -385,6 +385,8 @@ asmlinkage long sys_sigsuspend(old_sigset_t mask);
385asmlinkage long sys_sigsuspend(int unused1, int unused2, old_sigset_t mask); 385asmlinkage long sys_sigsuspend(int unused1, int unused2, old_sigset_t mask);
386#endif 386#endif
387 387
388asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize);
389
388#ifdef CONFIG_OLD_SIGACTION 390#ifdef CONFIG_OLD_SIGACTION
389asmlinkage long sys_sigaction(int, const struct old_sigaction __user *, 391asmlinkage long sys_sigaction(int, const struct old_sigaction __user *,
390 struct old_sigaction __user *); 392 struct old_sigaction __user *);