diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
| commit | d820306cbe56fb010f500ae58f9725f49812d39a (patch) | |
| tree | 1c9554107c7f279d05d6f54b1b5d69735d51195d /lib/lockref.c | |
| parent | ALSA: usb-audio: support wireless devices in snd_usb_parse_datainterval (diff) | |
| parent | ALSA: hda - hdmi: Fix channel map switch not taking effect (diff) | |
| download | linux-d820306cbe56fb010f500ae58f9725f49812d39a.tar.xz linux-d820306cbe56fb010f500ae58f9725f49812d39a.zip | |
Merge branch 'for-linus' into for-next
For updating the HDMI chmap fix.
Conflicts:
sound/pci/hda/patch_hdmi.c
Diffstat (limited to 'lib/lockref.c')
| -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 @@ while (likely(arch_spin_value_unlocked(old.lock.rlock.raw_lock))) { \ struct lockref new = old, prev = old; \ CODE \ - old.lock_count = cmpxchg(&lockref->lock_count, \ - old.lock_count, new.lock_count); \ + old.lock_count = cmpxchg64(&lockref->lock_count, \ + old.lock_count, new.lock_count); \ if (likely(old.lock_count == prev.lock_count)) { \ SUCCESS; \ } \ |