From: Florian Weimer Date: Wed, 13 Apr 2016 19:11:42 +0000 (-0500) Subject: malloc: Update comment for list_lock X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f95984beb2d3d61c71c14c10cdc5ab8fda321dec;p=thirdparty%2Fglibc.git malloc: Update comment for list_lock (cherry picked from commit 7962541a32eff5597bc4207e781cfac8d1bb0d87) --- diff --git a/ChangeLog b/ChangeLog index d97ce5a354a..fa02ac9d77c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-04-13 Florian Weimer + + * malloc/arena.c (list_lock): Update comment. + 2016-04-13 Florian Weimer * malloc/tst-malloc-thread-exit.c: Include test-skeleton.c early. diff --git a/malloc/arena.c b/malloc/arena.c index 463d31d88fc..f03dcb2aae4 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -85,9 +85,10 @@ static mstate free_list; _int_new_arena. This suffers from data races; see the FIXME comments in _int_new_arena and reused_arena. - list_lock also prevents concurrent forks. When list_lock is - acquired, no arena lock must be acquired, but it is permitted to - acquire arena locks after list_lock. */ + list_lock also prevents concurrent forks. At the time list_lock is + acquired, no arena lock must have been acquired, but it is + permitted to acquire arena locks subsequently, while list_lock is + acquired. */ static mutex_t list_lock = MUTEX_INITIALIZER; /* Mapped memory in non-main arenas (reliable only for NO_THREADS). */