diff options
author | Ulrich Drepper <drepper@redhat.com> | 2008-07-24 00:29:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:29 -0400 |
commit | 9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0 (patch) | |
tree | 49fb04cf552192e566d2aa6e18f40585230cba5a /include/asm-x86/unistd_64.h | |
parent | e38b36f325153eaadd1c2a7abc5762079233e540 (diff) |
flag parameters add-on: remove epoll_create size param
Remove the size parameter from the new epoll_create syscall and renames the
syscall itself. The updated test program follows.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#include <fcntl.h>
#include <stdio.h>
#include <time.h>
#include <unistd.h>
#include <sys/syscall.h>
#ifndef __NR_epoll_create2
# ifdef __x86_64__
# define __NR_epoll_create2 291
# elif defined __i386__
# define __NR_epoll_create2 329
# else
# error "need __NR_epoll_create2"
# endif
#endif
#define EPOLL_CLOEXEC O_CLOEXEC
int
main (void)
{
int fd = syscall (__NR_epoll_create2, 0);
if (fd == -1)
{
puts ("epoll_create2(0) failed");
return 1;
}
int coe = fcntl (fd, F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if (coe & FD_CLOEXEC)
{
puts ("epoll_create2(0) set close-on-exec flag");
return 1;
}
close (fd);
fd = syscall (__NR_epoll_create2, EPOLL_CLOEXEC);
if (fd == -1)
{
puts ("epoll_create2(EPOLL_CLOEXEC) failed");
return 1;
}
coe = fcntl (fd, F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if ((coe & FD_CLOEXEC) == 0)
{
puts ("epoll_create2(EPOLL_CLOEXEC) set close-on-exec flag");
return 1;
}
close (fd);
puts ("OK");
return 0;
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86/unistd_64.h')
-rw-r--r-- | include/asm-x86/unistd_64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h index c8cb88d70c6b..3a341d791792 100644 --- a/include/asm-x86/unistd_64.h +++ b/include/asm-x86/unistd_64.h | |||
@@ -645,8 +645,8 @@ __SYSCALL(__NR_paccept, sys_paccept) | |||
645 | __SYSCALL(__NR_signalfd4, sys_signalfd4) | 645 | __SYSCALL(__NR_signalfd4, sys_signalfd4) |
646 | #define __NR_eventfd2 290 | 646 | #define __NR_eventfd2 290 |
647 | __SYSCALL(__NR_eventfd2, sys_eventfd2) | 647 | __SYSCALL(__NR_eventfd2, sys_eventfd2) |
648 | #define __NR_epoll_create2 291 | 648 | #define __NR_epoll_create1 291 |
649 | __SYSCALL(__NR_epoll_create2, sys_epoll_create2) | 649 | __SYSCALL(__NR_epoll_create1, sys_epoll_create1) |
650 | #define __NR_dup3 292 | 650 | #define __NR_dup3 292 |
651 | __SYSCALL(__NR_dup3, sys_dup3) | 651 | __SYSCALL(__NR_dup3, sys_dup3) |
652 | #define __NR_pipe2 293 | 652 | #define __NR_pipe2 293 |