aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-25 01:53:12 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:16:17 -0500
commitc9716252befda972c94d2bbfa88abddf3377f8c5 (patch)
tree9d6af3a70a468eaf2866f82b7eeb0e438444b939
parent99b06feb0f7c99f171cb962d0e6a17f81625abd3 (diff)
sparc: bury the sys_sigpause() remains
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/sparc/kernel/signal_32.c7
-rw-r--r--arch/sparc/kernel/signal_64.c12
-rw-r--r--arch/sparc/kernel/systbls.h1
3 files changed, 2 insertions, 18 deletions
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index 7391fa89651f..6541604329c4 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -59,18 +59,13 @@ struct rt_signal_frame {
59#define SF_ALIGNEDSZ (((sizeof(struct signal_frame) + 7) & (~7))) 59#define SF_ALIGNEDSZ (((sizeof(struct signal_frame) + 7) & (~7)))
60#define RT_ALIGNEDSZ (((sizeof(struct rt_signal_frame) + 7) & (~7))) 60#define RT_ALIGNEDSZ (((sizeof(struct rt_signal_frame) + 7) & (~7)))
61 61
62static int _sigpause_common(old_sigset_t set) 62asmlinkage int sys_sigsuspend(old_sigset_t set)
63{ 63{
64 sigset_t blocked; 64 sigset_t blocked;
65 siginitset(&blocked, set); 65 siginitset(&blocked, set);
66 return sigsuspend(&blocked); 66 return sigsuspend(&blocked);
67} 67}
68 68
69asmlinkage int sys_sigsuspend(old_sigset_t set)
70{
71 return _sigpause_common(set);
72}
73
74asmlinkage void do_sigreturn(struct pt_regs *regs) 69asmlinkage void do_sigreturn(struct pt_regs *regs)
75{ 70{
76 struct signal_frame __user *sf; 71 struct signal_frame __user *sf;
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index 176e0e7b8f60..ea9d14ad1ea2 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -236,23 +236,13 @@ struct rt_signal_frame {
236 __siginfo_rwin_t *rwin_save; 236 __siginfo_rwin_t *rwin_save;
237}; 237};
238 238
239static long _sigpause_common(old_sigset_t set) 239asmlinkage long sys_sigsuspend(old_sigset_t set)
240{ 240{
241 sigset_t blocked; 241 sigset_t blocked;
242 siginitset(&blocked, set); 242 siginitset(&blocked, set);
243 return sigsuspend(&blocked); 243 return sigsuspend(&blocked);
244} 244}
245 245
246asmlinkage long sys_sigpause(unsigned int set)
247{
248 return _sigpause_common(set);
249}
250
251asmlinkage long sys_sigsuspend(old_sigset_t set)
252{
253 return _sigpause_common(set);
254}
255
256void do_rt_sigreturn(struct pt_regs *regs) 246void do_rt_sigreturn(struct pt_regs *regs)
257{ 247{
258 struct rt_signal_frame __user *sf; 248 struct rt_signal_frame __user *sf;
diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h
index 1dd89dbac8d8..5f8090951bd5 100644
--- a/arch/sparc/kernel/systbls.h
+++ b/arch/sparc/kernel/systbls.h
@@ -36,7 +36,6 @@ extern asmlinkage long sys_rt_sigaction(int sig,
36 36
37extern asmlinkage void sparc64_set_context(struct pt_regs *regs); 37extern asmlinkage void sparc64_set_context(struct pt_regs *regs);
38extern asmlinkage void sparc64_get_context(struct pt_regs *regs); 38extern asmlinkage void sparc64_get_context(struct pt_regs *regs);
39extern asmlinkage long sys_sigpause(unsigned int set);
40extern asmlinkage long sys_sigsuspend(old_sigset_t set); 39extern asmlinkage long sys_sigsuspend(old_sigset_t set);
41extern void do_rt_sigreturn(struct pt_regs *regs); 40extern void do_rt_sigreturn(struct pt_regs *regs);
42 41