aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/spinlock.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-12 11:42:45 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-12 11:42:45 -0400
commit8083e1656211eb1487329923d592ee061d08d7b3 (patch)
tree92a44787484996b82365fab21f2dec960ab4f2d3 /include/asm-arm/spinlock.h
parent6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff)
parent1802ca745280b916cda4090e459741b8c9b3e8d0 (diff)
downloadkernel_samsung_smdk4412-8083e1656211eb1487329923d592ee061d08d7b3.zip
kernel_samsung_smdk4412-8083e1656211eb1487329923d592ee061d08d7b3.tar.gz
kernel_samsung_smdk4412-8083e1656211eb1487329923d592ee061d08d7b3.tar.bz2
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/asm-arm/spinlock.h')
-rw-r--r--include/asm-arm/spinlock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h
index e2f1d75..01b7c26 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"