diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2013-10-17 23:40:08 -0400 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2013-10-17 23:40:08 -0400 |
| commit | 2f8d01a1475cfede058c6a92b5d3dad576da2827 (patch) | |
| tree | e004311de4c4c4075e91ca317a19983e2a612209 /lib | |
| parent | 82ea046c95a3c3ddcfa058c8a270b9afb6e93700 (diff) | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
Merge remote-tracking branch 'kvm/next' into kvm-arm-next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lockref.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/lockref.c b/lib/lockref.c index e2cd2c0a8821..677d036cf3c7 100644 --- a/lib/lockref.c +++ b/lib/lockref.c | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | while (likely(arch_spin_value_unlocked(old.lock.rlock.raw_lock))) { \ | 14 | while (likely(arch_spin_value_unlocked(old.lock.rlock.raw_lock))) { \ |
| 15 | struct lockref new = old, prev = old; \ | 15 | struct lockref new = old, prev = old; \ |
| 16 | CODE \ | 16 | CODE \ |
| 17 | old.lock_count = cmpxchg(&lockref->lock_count, \ | 17 | old.lock_count = cmpxchg64(&lockref->lock_count, \ |
| 18 | old.lock_count, new.lock_count); \ | 18 | old.lock_count, new.lock_count); \ |
| 19 | if (likely(old.lock_count == prev.lock_count)) { \ | 19 | if (likely(old.lock_count == prev.lock_count)) { \ |
| 20 | SUCCESS; \ | 20 | SUCCESS; \ |
| 21 | } \ | 21 | } \ |