[src/trunk]: src/lib/libpthread Revert 1.14 now that the arduous task of fixi...

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

details:   https://anonhg.NetBSD.org/src/rev/e967c0707afd
branches:  trunk
changeset: 340180:e967c0707afd
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Aug 25 13:46:23 2015 +0000

description:
Revert 1.14 now that the arduous task of fixing rumphijack to allow
mmap() in early init has been completed.

diffstat:

 lib/libpthread/pthread_tsd.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 27614fb623db -r e967c0707afd lib/libpthread/pthread_tsd.c
--- a/lib/libpthread/pthread_tsd.c      Tue Aug 25 13:45:00 2015 +0000
+++ b/lib/libpthread/pthread_tsd.c      Tue Aug 25 13:46:23 2015 +0000
@@ -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 @@
 #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 @@
            + 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;