commit 9382378b6b271949bdce527ea3da748c13c4c692
author Elliott Hughes <enh@google.com> Wed May 21 18:01:17 2014 -0700
committer Elliott Hughes <enh@google.com> Wed May 21 18:01:17 2014 -0700
tree 9b20c4e7b8e8dc733937f9125cd22b4c11c046a7
parent d83062287758be57d1d0908b30bb18aa9b367f38
parent b108091734ee7668084cc1063187c2b10ddb7bb7

resolved conflicts for merge of b1080917 to master

Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index ce08ff1..cfae54e 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2752,7 +2752,7 @@
         if (state->mCommand == FastMixerState::COLD_IDLE) {
             int32_t old = android_atomic_inc(&mFastMixerFutex);
             if (old == -1) {
-                (void) __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1);
+                (void) __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL);
             }
         }
         state->mCommand = FastMixerState::EXIT;
@@ -2809,7 +2809,7 @@
             if (state->mCommand == FastMixerState::COLD_IDLE) {
                 int32_t old = android_atomic_inc(&mFastMixerFutex);
                 if (old == -1) {
-                    (void) __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1);
+                    (void) __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL);
                 }
 #ifdef AUDIO_WATCHDOG
                 if (mAudioWatchdog != 0) {