diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-08-21 09:57:15 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-08-21 09:57:15 -0700 |
| commit | e5dee2c896f04d88defdfa00282fa83f5f4004d8 (patch) | |
| tree | caebcffacffc0363dc418694eba18b2ce6b8617b /sysdeps/unix/sysv/linux/eventfd.c | |
| parent | 8c7c251746ce41779637c83e3b35639517f728d5 (diff) | |
| download | glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.tar.gz glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.tar.xz glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.zip | |
Revert "Add INLINE_SYSCALL_RETURN/INLINE_SYSCALL_ERROR_RETURN"
This reverts commit 0c5b8b5941e036dcaac69cecee9f01fdf9218e6e.
Diffstat (limited to 'sysdeps/unix/sysv/linux/eventfd.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/eventfd.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/eventfd.c b/sysdeps/unix/sysv/linux/eventfd.c index 1496a0e651..d4ffb3cedc 100644 --- a/sysdeps/unix/sysv/linux/eventfd.c +++ b/sysdeps/unix/sysv/linux/eventfd.c @@ -25,14 +25,11 @@ int eventfd (unsigned int count, int flags) { #ifdef __NR_eventfd2 + int res = INLINE_SYSCALL (eventfd2, 2, count, flags); # ifndef __ASSUME_EVENTFD2 - INTERNAL_SYSCALL_DECL (err); - int res = INTERNAL_SYSCALL (eventfd2, err, 2, count, flags); - if (!__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (res, err)) - || INTERNAL_SYSCALL_ERRNO (res, err) != ENOSYS) - return res; + if (res != -1 || errno != ENOSYS) # endif - return INLINE_SYSCALL_RETURN (eventfd2, 2, int, count, flags); + return res; #endif #ifndef __ASSUME_EVENTFD2 @@ -41,12 +38,16 @@ eventfd (unsigned int count, int flags) kernel (sys_indirect) before implementing setting flags like O_NONBLOCK etc. */ if (flags != 0) - return INLINE_SYSCALL_ERROR_RETURN (-EINVAL, int, -1) + { + __set_errno (EINVAL); + return -1; + } # ifdef __NR_eventfd - return INLINE_SYSCALL_RETURN (eventfd, 1, int, count) + return INLINE_SYSCALL (eventfd, 1, count); # else - return INLINE_SYSCALL_ERROR_RETURN (-ENOSYS, int, -1) + __set_errno (ENOSYS); + return -1; # endif #elif !defined __NR_eventfd2 # error "__ASSUME_EVENTFD2 defined but not __NR_eventfd2" |