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/Threads.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/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 6b8bda0..92f0f5a 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_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL); + (void) syscall(__NR_futex, &mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1); } } 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_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL); + (void) syscall(__NR_futex, &mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1); } #ifdef AUDIO_WATCHDOG if (mAudioWatchdog != 0) { |