aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads/spinlock.h
diff options
context:
space:
mode:
Diffstat (limited to 'linuxthreads/spinlock.h')
-rw-r--r--linuxthreads/spinlock.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/linuxthreads/spinlock.h b/linuxthreads/spinlock.h
index 0dbaa54e2d..0ec40c57cb 100644
--- a/linuxthreads/spinlock.h
+++ b/linuxthreads/spinlock.h
@@ -104,10 +104,6 @@ static inline void __pthread_init_lock(struct _pthread_fastlock * lock)
static inline int __pthread_trylock (struct _pthread_fastlock * lock)
{
-#if defined HAS_COMPARE_AND_SWAP
- long oldstatus;
-#endif
-
#if defined TEST_FOR_COMPARE_AND_SWAP
if (!__pthread_has_cas)
#endif
@@ -119,8 +115,7 @@ static inline int __pthread_trylock (struct _pthread_fastlock * lock)
#if defined HAS_COMPARE_AND_SWAP
do {
- oldstatus = lock->__status;
- if (oldstatus != 0) return EBUSY;
+ if (lock->__status != 0) return EBUSY;
} while(! __compare_and_swap(&lock->__status, 0, 1));
return 0;
#endif
@@ -146,10 +141,6 @@ static inline void __pthread_alt_init_lock(struct _pthread_fastlock * lock)
static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock)
{
-#if defined HAS_COMPARE_AND_SWAP
- long oldstatus;
-#endif
-
#if defined TEST_FOR_COMPARE_AND_SWAP
if (!__pthread_has_cas)
#endif
@@ -173,8 +164,7 @@ static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock)
#if defined HAS_COMPARE_AND_SWAP
do {
- oldstatus = lock->__status;
- if (oldstatus != 0) return EBUSY;
+ if (lock->__status != 0) return EBUSY;
} while(! compare_and_swap(&lock->__status, 0, 1, &lock->__spinlock));
return 0;
#endif