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/FastThread.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/FastThread.cpp')
| -rw-r--r-- | services/audioflinger/FastThread.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/services/audioflinger/FastThread.cpp b/services/audioflinger/FastThread.cpp index 8a216b3..216dace 100644 --- a/services/audioflinger/FastThread.cpp +++ b/services/audioflinger/FastThread.cpp @@ -20,10 +20,9 @@ #define ATRACE_TAG ATRACE_TAG_AUDIO #include "Configuration.h" +#include <linux/futex.h> +#include <sys/syscall.h> #include <utils/Log.h> -extern "C" { -#include "../private/bionic_futex.h" -} #include <utils/Trace.h> #include "FastThread.h" @@ -157,7 +156,7 @@ bool FastThread::threadLoop() ALOG_ASSERT(coldFutexAddr != NULL); int32_t old = android_atomic_dec(coldFutexAddr); if (old <= 0) { - __futex_syscall4(coldFutexAddr, FUTEX_WAIT_PRIVATE, old - 1, NULL); + syscall(__NR_futex, coldFutexAddr, FUTEX_WAIT_PRIVATE, old - 1, NULL); } int policy = sched_getscheduler(0); if (!(policy == SCHED_FIFO || policy == SCHED_RR)) { |