From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 25 Nov 2012 06:53:12 +0000 (-0500)
Subject: sparc: bury the sys_sigpause() remains
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c9716252befda972c94d2bbfa88abddf3377f8c5;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

sparc: bury the sys_sigpause() remains

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

diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index 7391fa89651..6541604329c 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -59,18 +59,13 @@ struct rt_signal_frame {
 #define SF_ALIGNEDSZ  (((sizeof(struct signal_frame) + 7) & (~7)))
 #define RT_ALIGNEDSZ  (((sizeof(struct rt_signal_frame) + 7) & (~7)))
 
-static int _sigpause_common(old_sigset_t set)
+asmlinkage int sys_sigsuspend(old_sigset_t set)
 {
 	sigset_t blocked;
 	siginitset(&blocked, set);
 	return sigsuspend(&blocked);
 }
 
-asmlinkage int sys_sigsuspend(old_sigset_t set)
-{
-	return _sigpause_common(set);
-}
-
 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
index 176e0e7b8f6..ea9d14ad1ea 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -236,23 +236,13 @@ struct rt_signal_frame {
 	__siginfo_rwin_t	*rwin_save;
 };
 
-static long _sigpause_common(old_sigset_t set)
+asmlinkage long sys_sigsuspend(old_sigset_t set)
 {
 	sigset_t blocked;
 	siginitset(&blocked, set);
 	return sigsuspend(&blocked);
 }
 
-asmlinkage long sys_sigpause(unsigned int set)
-{
-	return _sigpause_common(set);
-}
-
-asmlinkage long sys_sigsuspend(old_sigset_t set)
-{
-	return _sigpause_common(set);
-}
-
 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
index 1dd89dbac8d..5f8090951bd 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,
 
 extern asmlinkage void sparc64_set_context(struct pt_regs *regs);
 extern asmlinkage void sparc64_get_context(struct pt_regs *regs);
-extern asmlinkage long sys_sigpause(unsigned int set);
 extern asmlinkage long sys_sigsuspend(old_sigset_t set);
 extern void do_rt_sigreturn(struct pt_regs *regs);