From cad7ca390879f2a8250e58bf5009a00b887a19b7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 15 Nov 2017 14:36:25 -0200
Subject: [PATCH] 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
wrapper.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
 ChangeLog                            | 4 ++++
 sysdeps/unix/sysv/linux/epoll_wait.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 420217e7d5..c26eac8d32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-15  Luke Shumaker  <lukeshu@parabola.nu>
+
+	* sysdeps/unix/sysv/linux/epoll_wait.c: Include <sysdep-cancel.h>.
+
 2017-11-15  Mike FABIAN  <mfabian@redhat.com>
 
 	* 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 eb6e6d3ace..b324ff832a 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>
+
 int
 epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout)
 {
-- 
2.43.5