From 2c2c003a5d1494ac0a06fb2fee0b2475a99d9bb7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 21 May 2007 18:25:03 +0000 Subject: [PATCH] [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. --- ChangeLog | 7 +++++++ nptl/sysdeps/unix/sysv/linux/unregister-atfork.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0e7622..2495985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-05-21 Jakub Jelinek + [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 --- 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 , 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; } -- 2.7.4