From 32daece6bcac21ef3c8d9326fa4eab80d35affba Mon Sep 17 00:00:00 2001 From: kamil Date: Sat, 1 Feb 2020 18:14:16 +0000 Subject: Revert previous 'git grep' breaks now. --- lib/libc/gen/pthread_atfork.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'lib/libc') diff --git a/lib/libc/gen/pthread_atfork.c b/lib/libc/gen/pthread_atfork.c index e983552683b..bfa08bf9e2d 100644 --- a/lib/libc/gen/pthread_atfork.c +++ b/lib/libc/gen/pthread_atfork.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_atfork.c,v 1.11 2020/02/01 15:38:46 kamil Exp $ */ +/* $NetBSD: pthread_atfork.c,v 1.12 2020/02/01 18:14:16 kamil Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -31,17 +31,15 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: pthread_atfork.c,v 1.11 2020/02/01 15:38:46 kamil Exp $"); +__RCSID("$NetBSD: pthread_atfork.c,v 1.12 2020/02/01 18:14:16 kamil Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" -#include -#include -#include #include #include #include +#include #include "reentrant.h" #ifdef __weak_alias @@ -75,22 +73,11 @@ static struct atfork_callback_q childq = SIMPLEQ_HEAD_INITIALIZER(childq); static struct atfork_callback * af_alloc(void) { - void *arena; - size_t sz; if (atfork_builtin.fn == NULL) return &atfork_builtin; - /* - * Avoid using here malloc() as this function is used on early init - * and can prematuraly initialize the malloc library. - * malloc() allocations here also confuse the LLVM Leak Sanitizer. - */ - sz = sizeof(atfork_builtin); - arena = mmap(NULL, sz, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); - if (arena == MAP_FAILED) - return NULL; - return arena; + return malloc(sizeof(atfork_builtin)); } static void @@ -98,7 +85,7 @@ af_free(struct atfork_callback *af) { if (af != &atfork_builtin) - munmap(af, sizeof(atfork_builtin)); + free(af); } int -- cgit