This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-762-gcad7ca3

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  cad7ca390879f2a8250e58bf5009a00b887a19b7 (commit)
      from  58c9f659ee99ee370ebb443de4155b67645c807a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------;a=commitdiff;h=cad7ca390879f2a8250e58bf5009a00b887a19b7

commit cad7ca390879f2a8250e58bf5009a00b887a19b7
Author: Luke Shumaker <>
Date:   Wed Nov 15 14:36:25 2017 -0200

    linux: Include <sysdep-cancel.h> for epoll_wait
    The epoll_wait wrapper uses the raw syscall if __NR_epoll_wait is defined,
    and falls back to calling epoll_pwait(..., NULL) if it isn't defined.
    However, it didn't include the appropriate headers for __NR_epoll_wait to
    be defined, so it was *always* falling back to calling epoll_pwait!
    This mistake was introduced in b62c3815912bc679a966134affdedd3f35ae8621,
    when epoll_wait changed from being in syscalls.list to always having a C
    Reviewed-by: Adhemerval Zanella <>

diff --git a/ChangeLog b/ChangeLog
index 420217e..c26eac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-15  Luke Shumaker  <>
+	* sysdeps/unix/sysv/linux/epoll_wait.c: Include <sysdep-cancel.h>.
 2017-11-15  Mike FABIAN  <>
 	* localedata/locales/ka_GE (LC_MESSAGES): Add â??Xâ?? back to yesexpr,
diff --git a/sysdeps/unix/sysv/linux/epoll_wait.c b/sysdeps/unix/sysv/linux/epoll_wait.c
index eb6e6d3..b324ff8 100644
--- a/sysdeps/unix/sysv/linux/epoll_wait.c
+++ b/sysdeps/unix/sysv/linux/epoll_wait.c
@@ -21,6 +21,8 @@
 #include <sys/types.h>
 #include <sys/epoll.h>
+#include <sysdep-cancel.h>
 epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout)


Summary of changes:
 ChangeLog                            |    4 ++++
 sysdeps/unix/sysv/linux/epoll_wait.c |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

GNU C Library master sources

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]