From eaa39941fde878e7eff42ef6688dcfef2aa19f74 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 25 Dec 2012 16:18:10 -0500 Subject: [PATCH] --- yaml --- r: 356756 b: refs/heads/master c: 52ad6b3f90c63653ba24c4f63f218a925b8e14d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/Kconfig | 1 + trunk/arch/sparc/kernel/signal_32.c | 7 ------- trunk/arch/sparc/kernel/signal_64.c | 7 ------- trunk/arch/sparc/kernel/systbls.h | 1 - 5 files changed, 2 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 42feafded608..6951c1cb70e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7540c8eb330972870c2c1f1e8037acda2ff6a896 +refs/heads/master: 52ad6b3f90c63653ba24c4f63f218a925b8e14d7 diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index 1a8ef82b3475..e557b0821540 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/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/trunk/arch/sparc/kernel/signal_32.c b/trunk/arch/sparc/kernel/signal_32.c index 6541604329c4..cd1823487759 100644 --- a/trunk/arch/sparc/kernel/signal_32.c +++ b/trunk/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/trunk/arch/sparc/kernel/signal_64.c b/trunk/arch/sparc/kernel/signal_64.c index ea9d14ad1ea2..165a897a4133 100644 --- a/trunk/arch/sparc/kernel/signal_64.c +++ b/trunk/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/trunk/arch/sparc/kernel/systbls.h b/trunk/arch/sparc/kernel/systbls.h index 5f8090951bd5..26e6dd72e92a 100644 --- a/trunk/arch/sparc/kernel/systbls.h +++ b/trunk/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 */