sparc: switch to generic old sigsuspend

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
git-mirror · Feb 4, 2013 · 52ad6b3 · 52ad6b3
1 parent 7540c8e
commit 52ad6b3
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
@@ -47,6 +47,7 @@ config SPARC
 	select GENERIC_COMPAT_RT_SIGPROCMASK
 	select GENERIC_COMPAT_RT_SIGPENDING
 	select GENERIC_COMPAT_RT_SIGACTION
+	select OLD_SIGSUSPEND
 
 config SPARC32
 	def_bool !64BIT

diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
@@ -59,13 +59,6 @@ struct rt_signal_frame {
 #define SF_ALIGNEDSZ  (((sizeof(struct signal_frame) + 7) & (~7)))
 #define RT_ALIGNEDSZ  (((sizeof(struct rt_signal_frame) + 7) & (~7)))
 
-asmlinkage int sys_sigsuspend(old_sigset_t set)
-{
-	sigset_t blocked;
-	siginitset(&blocked, set);
-	return sigsuspend(&blocked);
-}
-
 asmlinkage void do_sigreturn(struct pt_regs *regs)
 {
 	struct signal_frame __user *sf;

diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
@@ -236,13 +236,6 @@ struct rt_signal_frame {
 	__siginfo_rwin_t	*rwin_save;
 };
 
-asmlinkage long sys_sigsuspend(old_sigset_t set)
-{
-	sigset_t blocked;
-	siginitset(&blocked, set);
-	return sigsuspend(&blocked);
-}
-
 void do_rt_sigreturn(struct pt_regs *regs)
 {
 	struct rt_signal_frame __user *sf;

diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h
@@ -36,7 +36,6 @@ extern asmlinkage long sys_rt_sigaction(int sig,
 
 extern asmlinkage void sparc64_set_context(struct pt_regs *regs);
 extern asmlinkage void sparc64_get_context(struct pt_regs *regs);
-extern asmlinkage long sys_sigsuspend(old_sigset_t set);
 extern void do_rt_sigreturn(struct pt_regs *regs);
 
 #endif /* _SYSTBLS_H */