diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 00:39:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 00:39:10 +0000 |
| commit | acbd9492996348bf4565fbaa5a14772f0f4ace38 (patch) | |
| tree | 396267d5b424f0335491e80a95920ae200b956d9 /services | |
| parent | 4c9bde7a3e636d3ecccd7905d142dbbb80e977a0 (diff) | |
| parent | d084206d5a4a5364211af46e4201311933e83bfc (diff) | |
| download | frameworks_av-acbd9492996348bf4565fbaa5a14772f0f4ace38.zip frameworks_av-acbd9492996348bf4565fbaa5a14772f0f4ace38.tar.gz frameworks_av-acbd9492996348bf4565fbaa5a14772f0f4ace38.tar.bz2 | |
am d084206d: Merge "Move frameworks/av off __futex_syscall3."
* commit 'd084206d5a4a5364211af46e4201311933e83bfc':
Move frameworks/av off __futex_syscall3.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 0f2a445..6b8bda0 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2604,7 +2604,7 @@ AudioFlinger::MixerThread::~MixerThread() if (state->mCommand == FastMixerState::COLD_IDLE) { int32_t old = android_atomic_inc(&mFastMixerFutex); if (old == -1) { - __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1); + __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL); } } state->mCommand = FastMixerState::EXIT; @@ -2661,7 +2661,7 @@ ssize_t AudioFlinger::MixerThread::threadLoop_write() if (state->mCommand == FastMixerState::COLD_IDLE) { int32_t old = android_atomic_inc(&mFastMixerFutex); if (old == -1) { - __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1); + __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL); } #ifdef AUDIO_WATCHDOG if (mAudioWatchdog != 0) { diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index d07113c..c196f77 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -952,7 +952,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_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX); + (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); mIsInvalid = true; } @@ -1839,7 +1839,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_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX); + (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); } |