[src/netbsd-6]: src/lib/libc/stdlib Pull up following revision(s) (requested ...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e208af3476e
branches:  netbsd-6
changeset: 776742:3e208af3476e
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Nov 03 15:45:45 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1121):
        lib/libc/stdlib/jemalloc.c: revision 1.33
Hold arenas_mtx across (still unused) _malloc_pre/postfork (PR 47428).

diffstat:

 lib/libc/stdlib/jemalloc.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r be33c8083e18 -r 3e208af3476e lib/libc/stdlib/jemalloc.c
--- a/lib/libc/stdlib/jemalloc.c        Mon Nov 03 15:27:46 2014 +0000
+++ b/lib/libc/stdlib/jemalloc.c        Mon Nov 03 15:45:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jemalloc.c,v 1.24.6.2 2012/04/23 23:40:40 riz Exp $    */
+/*     $NetBSD: jemalloc.c,v 1.24.6.3 2014/11/03 15:45:45 msaitoh Exp $        */
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans <jasone%FreeBSD.org@localhost>.
@@ -118,7 +118,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.24.6.2 2012/04/23 23:40:40 riz Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.24.6.3 2014/11/03 15:45:45 msaitoh Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -3915,7 +3915,6 @@
                if (arenas[i] != NULL)
                        malloc_mutex_lock(&arenas[i]->mtx);
        }
-       malloc_mutex_unlock(&arenas_mtx);
 
        malloc_mutex_lock(&base_mtx);
 
@@ -3933,7 +3932,6 @@
 
        malloc_mutex_unlock(&base_mtx);
 
-       malloc_mutex_lock(&arenas_mtx);
        for (i = 0; i < narenas; i++) {
                if (arenas[i] != NULL)
                        malloc_mutex_unlock(&arenas[i]->mtx);