[BZ #4525]

	* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add epoll_pwait.
	* sysdeps/unix/sysv/linux/epoll_pwait.c: New file.
	* sysdeps/unix/sysv/linux/syscalls.list (epoll_pwait): Remove.

	* sysdeps/unix/sysv/linux/x86_64/sys/epoll.h (epoll_pwait): Declare.

diff --git a/ChangeLog b/ChangeLog
index e0e7622..2495985 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-05-21  Jakub Jelinek  <jakub@redhat.com>
 
+       [BZ #4525]
+       * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add epoll_pwait.
+       * sysdeps/unix/sysv/linux/epoll_pwait.c: New file.
+       * sysdeps/unix/sysv/linux/syscalls.list (epoll_pwait): Remove.
+
+       * sysdeps/unix/sysv/linux/x86_64/sys/epoll.h (epoll_pwait): Declare.
+
        [BZ #4514]
        * stdio-common/vfprintf.c (vfprintf): Don't shadow workstart variable,
        reinitialize workend at the start of each do_positional format spec

diff --git a/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c b/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
index 2aa9a73..964f5b7 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
+++ b/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -104,7 +104,7 @@ __unregister_atfork (dso_handle)
       atomic_decrement (&deleted->handler->refcntr);
       unsigned int val;
       while ((val = deleted->handler->refcntr) != 0)
-       lll_futex_wait (&deleted->handler->refcntr, val, LLL_FUTEX_PRIVATE);
+       lll_futex_wait (&deleted->handler->refcntr, val);
 
       deleted = deleted->next;
     }