diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /include/asm-arm/spinlock.h | |
parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-arm/spinlock.h')
-rw-r--r-- | include/asm-arm/spinlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h index e2f1d75171d..01b7c26a303 100644 --- a/include/asm-arm/spinlock.h +++ b/include/asm-arm/spinlock.h @@ -201,7 +201,7 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw) static inline int __raw_read_trylock(raw_rwlock_t *rw) { - unsigned long tmp tmp2 = 1; + unsigned long tmp, tmp2 = 1; __asm__ __volatile__( "1: ldrex %0, [%2]\n" |