summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-21 17:31:18 -0700
committerElliott Hughes <enh@google.com>2014-05-21 17:31:18 -0700
commit77e1512aee8092069514973379a59a318e721be3 (patch)
tree875411e1d44b2cf12e99134af2d7cfb7f9acceae /services
parentce473c32705e2d1c5fcc817198101e1220b3c8f7 (diff)
downloadframeworks_av-77e1512aee8092069514973379a59a318e721be3.zip
frameworks_av-77e1512aee8092069514973379a59a318e721be3.tar.gz
frameworks_av-77e1512aee8092069514973379a59a318e721be3.tar.bz2
Move frameworks/av off __futex_syscall3.
Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/Threads.cpp4
-rw-r--r--services/audioflinger/Tracks.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 69a1883..6ed72dc 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2603,7 +2603,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;
@@ -2660,7 +2660,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 b59333f..3d15900 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);
}