From 94833f118b7b78a89595427c9d1a27f38084dbb9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 28 Oct 2007 01:34:10 +0000 Subject: [PATCH] [BZ #5040] * sysdeps/unix/sysv/linux/sys/epoll.h (EPOLLRDHUP): Add value. --- ChangeLog | 3 +++ nptl/ChangeLog | 10 ++++++++++ sysdeps/unix/sysv/linux/sys/epoll.h | 4 +++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fbb7421edb..a350fb7924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-10-27 Andreas Jaeger + [BZ #5040] + * sysdeps/unix/sysv/linux/sys/epoll.h (EPOLLRDHUP): Add value. + [BZ #3112] * sysdeps/ia64/backtrace.c (init): Free shared library if incorrect. (__cleanup): Free shared library when exiting. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index eb9dd20b5a..5eabd538bc 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,13 @@ +2007-10-27 Ulrich Drepper + + * sysdeps/pthread/malloc-machine.h: Define ATFORK_MEM. + Redefine thread_atfork for use of ATFORK_MEM. + * sysdeps/unix/sysv/linux/fork.h: Define __linkin_atfork. + * sysdeps/unix/sysv/linux/register-atfork.c (__linkin_atfork): New + function. + * sysdeps/unix/sysv/linux/unregister-atfork.c (__unregister_atfork): + Use atomic operation when removing first element of list. + 2007-10-17 Jakub Jelinek * sysdeps/unix/sysv/linux/i386/i486/sem_post.S (__old_sem_post): New diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h index d8901f7d53..f4e8bda99a 100644 --- a/sysdeps/unix/sysv/linux/sys/epoll.h +++ b/sysdeps/unix/sysv/linux/sys/epoll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002-2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -53,6 +53,8 @@ enum EPOLL_EVENTS #define EPOLLERR EPOLLERR EPOLLHUP = 0x010, #define EPOLLHUP EPOLLHUP + EPOLLRDHUP = 0x2000, +#define EPOLLRDHUP EPOLLRDHUP EPOLLONESHOT = (1 << 30), #define EPOLLONESHOT EPOLLONESHOT EPOLLET = (1 << 31)