Fix minor fallout from yesterdays sparc nptl changes.

nptl/

	* 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.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index ad47d67cbcabb914f90ab0b481278a7824ca07df..324b234ac2a4757d704bf4ff0c517ce720bf0262 100644 (file)
--- 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 db4a7b1c05f0397ffb9fdb3739fe6186779028e7..580796981e05982985f6722a31afa3af2a0ebf3a 100644 (file)
--- 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 7d7875cc99c4709b9a5004cf9c296b4a6bf24934..d33b375bf73486f2f4d21bab08a4cc48609f84de 100644 (file)
--- 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 5e7b0fade94fbb80de28e1c90ca7f1e758b21ee8..cd3b01fcb069c9425c4ead8fd0a6b2910980540f 100644 (file)
--- 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 e668c395c50e57808320f5e1ae30b219919c8a88..4936814cf88bafd4e5f8f3206eb6153d37eda0e5 100644 (file)
--- 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)