From fa4f21790ad52ae6c93ca419ea2ba1c4a9059e94 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 23 Apr 2008 19:15:34 -0700
Subject: [PATCH] --- yaml --- r: 91978 b: refs/heads/master c:
 a5c564279854c971a27cc650be4bb32c290e9ae7 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc/kernel/entry.S  | 1 -
 trunk/arch/sparc/kernel/signal.c | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1ddb0def84b4..99608cbb5ed5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 919ee677b656c52c5f86d3d916786891220d5452
+refs/heads/master: a5c564279854c971a27cc650be4bb32c290e9ae7
diff --git a/trunk/arch/sparc/kernel/entry.S b/trunk/arch/sparc/kernel/entry.S
index 135644f8add7..484c83d23eef 100644
--- a/trunk/arch/sparc/kernel/entry.S
+++ b/trunk/arch/sparc/kernel/entry.S
@@ -1409,7 +1409,6 @@ syscall_is_too_hard:
 
 	st	%o0, [%sp + STACKFRAME_SZ + PT_I0]
 
-	.globl	ret_sys_call
 ret_sys_call:
 	ld	[%curptr + TI_FLAGS], %l6
 	cmp	%o0, -ERESTART_RESTARTBLOCK
diff --git a/trunk/arch/sparc/kernel/signal.c b/trunk/arch/sparc/kernel/signal.c
index 1f730619a24a..3e849e8e3480 100644
--- a/trunk/arch/sparc/kernel/signal.c
+++ b/trunk/arch/sparc/kernel/signal.c
@@ -105,11 +105,6 @@ static int _sigpause_common(old_sigset_t set)
 	return -ERESTARTNOHAND;
 }
 
-asmlinkage int sys_sigpause(unsigned int set)
-{
-	return _sigpause_common(set);
-}
-
 asmlinkage int sys_sigsuspend(old_sigset_t set)
 {
 	return _sigpause_common(set);