diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-03-19 21:36:10 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-03-19 21:36:10 -0400 |
| commit | 685e40bb09f5f24a2af54ea09c97328808f76990 (patch) | |
| tree | 73bbf60045bb3a9c8af4f2639e8adb2ad1ea6994 /src/thread/__timedwait.c | |
| parent | 462dbfc20788a6c9dd1ea4bb1cef086aa189615a (diff) | |
| download | musl-685e40bb09f5f24a2af54ea09c97328808f76990.tar.gz | |
syscall overhaul part two - unify public and internal syscall interface
with this patch, the syscallN() functions are no longer needed; a
variadic syscall() macro allows syscalls with anywhere from 0 to 6
arguments to be made with a single macro name. also, manually casting
each non-integer argument with (long) is no longer necessary; the
casts are hidden in the macros.
some source files which depended on being able to define the old macro
SYSCALL_RETURNS_ERRNO have been modified to directly use __syscall()
instead of syscall(). references to SYSCALL_SIGSET_SIZE and SYSCALL_LL
have also been changed.
x86_64 has not been tested, and may need a follow-up commit to fix any
minor bugs/oversights.
Diffstat (limited to 'src/thread/__timedwait.c')
| -rw-r--r-- | src/thread/__timedwait.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c index 988eb70d..b38ea990 100644 --- a/src/thread/__timedwait.c +++ b/src/thread/__timedwait.c @@ -1,7 +1,6 @@ #include <time.h> #include <errno.h> #include "futex.h" -#define SYSCALL_RETURN_ERRNO #include "syscall.h" #include <stdio.h> int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int priv) @@ -18,7 +17,7 @@ int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespe if (to.tv_sec < 0) return ETIMEDOUT; } if (priv) priv = 128; priv=0; - r = syscall4(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0); + r = __syscall(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0); if (r == ETIMEDOUT) return r; return 0; } |