From: Joseph Myers Date: Thu, 19 Nov 2009 16:36:58 +0000 (+0000) Subject: Assume pselect6 and ppoll on ARM for kernels 2.6.32 and later. X-Git-Tag: glibc-2.16-ports-before-merge~564 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a2e1f4e6a8a1d5523ebae4a1b938fdaf92e94bf;p=thirdparty%2Fglibc.git Assume pselect6 and ppoll on ARM for kernels 2.6.32 and later. --- diff --git a/ChangeLog.arm b/ChangeLog.arm index a3b558b40b2..e095c22c769 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,8 @@ +2009-11-19 Joseph Myers + + * sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_PSELECT, + __ASSUME_PPOLL): Don't undefine for kernel 2.6.32 and later. + 2009-11-18 Joseph Myers * sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Change misleading diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h index 1b0ab63380f..3996ae9c13b 100644 --- a/sysdeps/unix/sysv/linux/arm/kernel-features.h +++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h @@ -59,6 +59,8 @@ #include_next -/* These syscalls are not implemented yet for ARM. */ -#undef __ASSUME_PSELECT -#undef __ASSUME_PPOLL +/* Support for pselect6, ppoll and epoll_pwait was added in 2.6.32. */ +#if __LINUX_KERNEL_VERSION < 0x020620 +# undef __ASSUME_PSELECT +# undef __ASSUME_PPOLL +#endif