diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-21 18:47:50 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-21 18:47:50 -0700 |
| commit | e348c5b72ad889389c7c1c900c121f0fbee221b5 (patch) | |
| tree | 9c77581ad7520309c0bb90f11bba766a6cd61b28 /services/audioflinger/Tracks.cpp | |
| parent | 9382378b6b271949bdce527ea3da748c13c4c692 (diff) | |
| parent | c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc (diff) | |
| download | frameworks_av-e348c5b72ad889389c7c1c900c121f0fbee221b5.zip frameworks_av-e348c5b72ad889389c7c1c900c121f0fbee221b5.tar.gz frameworks_av-e348c5b72ad889389c7c1c900c121f0fbee221b5.tar.bz2 | |
resolved conflicts for merge of c0bf836f to master
Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da
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 68b86f4..f698fa2 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> @@ -1008,7 +1009,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; } @@ -1937,7 +1938,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); } |