5 files changed, 15 insertions, 4 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index ad47d67cbc..324b234ac2 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-03  David S. Miller  <davem@davemloft.net>
+
+	* sysdeps/sparc/sparc64/pthread_spin_unlock.S: Fix thinko, we
+	always have to return 0, especially for the pthread_spin_init
+	alias.
+	* sysdeps/sparc/sparc32/pthread_spin_lock.S: Add missing trailing
+	newline.
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: Likewise.
+	* sysdeps/sparc/sparc64/pthread_spin_lock.S: Likewise.
+
 2012-05-02  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/sparc64/pthread_spin_lock.S: New.
diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
index db4a7b1c05..580796981e 100644
--- a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
+++ b/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
@@ -29,4 +29,4 @@ ENTRY(pthread_spin_lock)
 	bne,a		2b
 	 ldub		[%o0], %g1
 	ba,a,pt		%xcc, 1b
-END(pthread_spin_lock)
\ No newline at end of file
+END(pthread_spin_lock)
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
index 7d7875cc99..d33b375bf7 100644
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
+++ b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
@@ -1 +1 @@
-#include <sparc64/pthread_spin_lock.S>
\ No newline at end of file
+#include <sparc64/pthread_spin_lock.S>
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
index 5e7b0fade9..cd3b01fcb0 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
+++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
@@ -28,4 +28,4 @@ ENTRY(pthread_spin_lock)
 	brnz,pt		%g1, 2b
 	 membar		#LoadLoad
 	ba,a,pt		%xcc, 1b
-END(pthread_spin_lock)
\ No newline at end of file
+END(pthread_spin_lock)
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
index e668c395c5..4936814cf8 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
+++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
@@ -20,8 +20,9 @@
 	.text
 ENTRY(pthread_spin_unlock)
 	membar		#StoreStore | #LoadStore
+	stb		%g0, [%o0]
 	retl
-	 stb		%g0, [%o0]
+	 clr		%o0
 END(pthread_spin_unlock)
 
 strong_alias (pthread_spin_unlock, pthread_spin_init)