From 35f52264a22eabfcea95c6fe066495959c90a76f Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 25 Nov 2012 01:53:12 -0500
Subject: [PATCH] --- yaml --- r: 356747 b: refs/heads/master c:
 c9716252befda972c94d2bbfa88abddf3377f8c5 h: refs/heads/master i:   356745:
 f2c5e8591a67d227a498d78b069302a9434e0047   356743:
 e391cbb299d4e483111ef58a4b5f5220e3725a9f v: v3

---
 [refs]                              |  2 +-
 trunk/arch/sparc/kernel/signal_32.c |  7 +------
 trunk/arch/sparc/kernel/signal_64.c | 12 +-----------
 trunk/arch/sparc/kernel/systbls.h   |  1 -
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 7dbad5dbfabb..435586e5d7ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99b06feb0f7c99f171cb962d0e6a17f81625abd3
+refs/heads/master: c9716252befda972c94d2bbfa88abddf3377f8c5
diff --git a/trunk/arch/sparc/kernel/signal_32.c b/trunk/arch/sparc/kernel/signal_32.c
index 7391fa89651f..6541604329c4 100644
--- a/trunk/arch/sparc/kernel/signal_32.c
+++ b/trunk/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/trunk/arch/sparc/kernel/signal_64.c b/trunk/arch/sparc/kernel/signal_64.c
index 176e0e7b8f60..ea9d14ad1ea2 100644
--- a/trunk/arch/sparc/kernel/signal_64.c
+++ b/trunk/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/trunk/arch/sparc/kernel/systbls.h b/trunk/arch/sparc/kernel/systbls.h
index 1dd89dbac8d8..5f8090951bd5 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_sigpause(unsigned int set);
 extern asmlinkage long sys_sigsuspend(old_sigset_t set);
 extern void do_rt_sigreturn(struct pt_regs *regs);