[24/26] Linux: epoll_pwait syscall number is always available

Message ID 196d8d5ac06764500c7fff6e9a6a26bfe66d587e.1581279333.git.fweimer@redhat.com
State New
Headers show
Series
  • Linux cleanups enabled by built-in system call tables
Related show

Commit Message

Florian Weimer Feb. 9, 2020, 8:21 p.m.
Due to the built-in tables, __NR_epoll_pwait is always defined.
---
 sysdeps/unix/sysv/linux/epoll_pwait.c | 16 ----------------
 1 file changed, 16 deletions(-)

-- 
2.24.1

Comments

Adhemerval Zanella Feb. 27, 2020, 11:46 p.m. | #1
On 09/02/2020 17:21, Florian Weimer wrote:
> Due to the built-in tables, __NR_epoll_pwait is always defined.


LGTM, thanks. 

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>


> ---

>  sysdeps/unix/sysv/linux/epoll_pwait.c | 16 ----------------

>  1 file changed, 16 deletions(-)

> 

> diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c

> index fcd2a47d85..66f04482c7 100644

> --- a/sysdeps/unix/sysv/linux/epoll_pwait.c

> +++ b/sysdeps/unix/sysv/linux/epoll_pwait.c

> @@ -23,8 +23,6 @@

>  #include <sysdep-cancel.h>

>  #include <sys/syscall.h>

>  

> -#ifdef __NR_epoll_pwait

> -

>  /* Wait for events on an epoll instance "epfd". Returns the number of

>     triggered events returned in "events" buffer. Or -1 in case of

>     error with the "errno" variable set to the specific error code. The

> @@ -42,18 +40,4 @@ int epoll_pwait (int epfd, struct epoll_event *events,

>    return SYSCALL_CANCEL (epoll_pwait, epfd, events, maxevents,

>  			 timeout, set, _NSIG / 8);

>  }

> -

> -#else

> -

> -int epoll_pwait (int epfd, struct epoll_event *events,

> -		 int maxevents, int timeout,

> -		 const sigset_t *set)

> -{

> -  __set_errno (ENOSYS);

> -  return -1;

> -}

> -stub_warning (epoll_pwait)

> -

> -#endif

> -

>  libc_hidden_def (epoll_pwait)

>

Patch

diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c
index fcd2a47d85..66f04482c7 100644
--- a/sysdeps/unix/sysv/linux/epoll_pwait.c
+++ b/sysdeps/unix/sysv/linux/epoll_pwait.c
@@ -23,8 +23,6 @@ 
 #include <sysdep-cancel.h>
 #include <sys/syscall.h>
 
-#ifdef __NR_epoll_pwait
-
 /* Wait for events on an epoll instance "epfd". Returns the number of
    triggered events returned in "events" buffer. Or -1 in case of
    error with the "errno" variable set to the specific error code. The
@@ -42,18 +40,4 @@  int epoll_pwait (int epfd, struct epoll_event *events,
   return SYSCALL_CANCEL (epoll_pwait, epfd, events, maxevents,
 			 timeout, set, _NSIG / 8);
 }
-
-#else
-
-int epoll_pwait (int epfd, struct epoll_event *events,
-		 int maxevents, int timeout,
-		 const sigset_t *set)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (epoll_pwait)
-
-#endif
-
 libc_hidden_def (epoll_pwait)