[commits] r9310 - in /fsf/glibc-2_11-branch/ports: ChangeLog.arm sysdeps/unix/sysv/linux/arm/kernel-features.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Nov 20 00:06:21 2009
New Revision: 9310

Log:
Import glibc-ports-2.11 for 2009-11-20

Modified:
    fsf/glibc-2_11-branch/ports/ChangeLog.arm
    fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h

Modified: fsf/glibc-2_11-branch/ports/ChangeLog.arm
==============================================================================
--- fsf/glibc-2_11-branch/ports/ChangeLog.arm (original)
+++ fsf/glibc-2_11-branch/ports/ChangeLog.arm Fri Nov 20 00:06:21 2009
@@ -1,3 +1,8 @@
+2009-11-19  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_PSELECT,
+	__ASSUME_PPOLL): Don't undefine for kernel 2.6.32 and later.
+
 2009-11-17  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	[BZ #10972]

Modified: fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
==============================================================================
--- fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h (original)
+++ fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h Fri Nov 20 00:06:21 2009
@@ -59,6 +59,8 @@
 
 #include_next <kernel-features.h>
 
-/* 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