summaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-10-10 14:51:46 +0000
committerJakub Jelinek <jakub@redhat.com>2005-10-10 14:51:46 +0000
commit2a61a5442b614a0f6b4b5c63501b641e83e8f229 (patch)
tree961710f1db68abe5e14c13f3cada17194cfdc9ad /malloc
parent74b2c78b9216d1d1642261da42bbe64544a667aa (diff)
Updated to fedora-glibc-20051010T1417
Diffstat (limited to 'malloc')
-rw-r--r--malloc/arena.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/malloc/arena.c b/malloc/arena.c
index a844392a6b..039d70ff18 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -277,7 +277,7 @@ ptmalloc_unlock_all (void)
#ifdef __linux__
-/* In LinuxThreads, unlocking a mutex in the child process after a
+/* In NPTL, unlocking a mutex in the child process after a
fork() is currently unsafe, whereas re-initializing it is safe and
does not leak resources. Therefore, a special atfork handler is
installed for the child. */
@@ -300,6 +300,7 @@ ptmalloc_unlock_all2 (void)
if(ar_ptr == &main_arena) break;
}
mutex_init(&list_lock);
+ atfork_recursive_cntr = 0;
}
#else