diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
| commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
| tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /include/asm-arm/spinlock.h | |
| parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rcu
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 800ba5254daf..2b41ebbfa7ff 100644 --- a/include/asm-arm/spinlock.h +++ b/include/asm-arm/spinlock.h | |||
| @@ -142,7 +142,7 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw) | |||
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | /* write_can_lock - would write_trylock() succeed? */ | 144 | /* write_can_lock - would write_trylock() succeed? */ |
| 145 | #define __raw_write_can_lock(x) ((x)->lock == 0x80000000) | 145 | #define __raw_write_can_lock(x) ((x)->lock == 0) |
| 146 | 146 | ||
| 147 | /* | 147 | /* |
| 148 | * Read locks are a bit more hairy: | 148 | * Read locks are a bit more hairy: |