diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 01:28:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 01:28:18 +0000 |
| commit | ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e (patch) | |
| tree | 74b759675cdc008e10e9b4fa94344e9dd54f8868 /services/audioflinger/Tracks.cpp | |
| parent | acbd9492996348bf4565fbaa5a14772f0f4ace38 (diff) | |
| parent | 3b6da6bfb50a1c0324fb4c87326d3a477944d5fe (diff) | |
| download | frameworks_av-ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e.zip frameworks_av-ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e.tar.gz frameworks_av-ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e.tar.bz2 | |
am 3b6da6bf: Merge "Move frameworks/av off private API."
* commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe':
Move frameworks/av off private API.
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index c196f77..cbf56b5 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -21,6 +21,7 @@ #include "Configuration.h" #include <math.h> +#include <sys/syscall.h> #include <utils/Log.h> #include <private/media/AudioTrackShared.h> @@ -952,7 +953,7 @@ void AudioFlinger::PlaybackThread::Track::invalidate() android_atomic_or(CBLK_INVALID, &cblk->mFlags); android_atomic_release_store(0x40000000, &cblk->mFutex); // client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE - (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); + (void) syscall(__NR_futex, &cblk->mFutex, FUTEX_WAKE, INT_MAX); mIsInvalid = true; } @@ -1839,7 +1840,7 @@ void AudioFlinger::RecordThread::RecordTrack::invalidate() android_atomic_or(CBLK_INVALID, &cblk->mFlags); android_atomic_release_store(0x40000000, &cblk->mFutex); // client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE - (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); + (void) syscall(__NR_futex, &cblk->mFutex, FUTEX_WAKE, INT_MAX); } |