Module Name: src
Committed By: pooka
Date: Tue Aug 25 13:46:23 UTC 2015
Modified Files:
src/lib/libpthread: pthread_tsd.c
Log Message:
Revert 1.14 now that the arduous task of fixing rumphijack to allow
mmap() in early init has been completed.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libpthread/pthread_tsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread_tsd.c
diff -u src/lib/libpthread/pthread_tsd.c:1.14 src/lib/libpthread/pthread_tsd.c:1.15
--- src/lib/libpthread/pthread_tsd.c:1.14 Sat May 30 14:42:26 2015
+++ src/lib/libpthread/pthread_tsd.c Tue Aug 25 13:46:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_tsd.c,v 1.14 2015/05/30 14:42:26 christos Exp $ */
+/* $NetBSD: pthread_tsd.c,v 1.15 2015/08/25 13:46:23 pooka Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_tsd.c,v 1.14 2015/05/30 14:42:26 christos Exp $");
+__RCSID("$NetBSD: pthread_tsd.c,v 1.15 2015/08/25 13:46:23 pooka Exp $");
/* Functions and structures dealing with thread-specific data */
#include <errno.h>
@@ -60,9 +60,6 @@ null_destructor(void *p)
#include <stdlib.h>
#include <stdio.h>
-/* Can't use mmap directly so early in the process because rump hijacks it */
-void *_mmap(void *, size_t, int, int, int, off_t);
-
void *
pthread_tsd_init(size_t *tlen)
{
@@ -88,7 +85,7 @@ pthread_tsd_init(size_t *tlen)
+ sizeof(*pthread__tsd_list) * pthread_keys_max
+ sizeof(*pthread__tsd_destructors) * pthread_keys_max;
- arena = _mmap(NULL, alen, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
+ arena = mmap(NULL, alen, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
if (arena == MAP_FAILED) {
pthread_keys_max = 0;
return NULL;
