remove _MALLOC_LOCK_INIT; major bump; ok deraadt@

2 files changed, 2 insertions, 8 deletions

diff --git a/src/lib/libc/include/thread_private.h b/src/lib/libc/include/thread_private.h
index f55880f7ba..c36bb02c5a 100644
--- a/src/lib/libc/include/thread_private.h
+++ b/src/lib/libc/include/thread_private.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: thread_private.h,v 1.22 2008/01/01 00:43:39 kurt Exp $ */
+/* $OpenBSD: thread_private.h,v 1.23 2008/06/13 21:18:42 otto Exp $ */
 
 /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
 
@@ -133,10 +133,6 @@ void	_thread_malloc_unlock(void);
                                         if (__isthreaded)               \
                                                 _thread_malloc_unlock();\
                                 } while (0)
-#define _MALLOC_LOCK_INIT()     do {                                    \
-                                        if (__isthreaded)               \
-                                                _thread_malloc_init();\
-                                } while (0)
 
 void    _thread_atexit_lock(void);
 void    _thread_atexit_unlock(void);
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index a4a4e52bda..6042e47e69 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: malloc.c,v 1.90 2008/05/19 19:36:15 otto Exp $        */
+/*      $OpenBSD: malloc.c,v 1.91 2008/06/13 21:18:42 otto Exp $        */
 
 /*
  * ----------------------------------------------------------------------------
@@ -656,8 +656,6 @@ malloc_init(void)
         char            *p, b[64];
         int             i, j, save_errno = errno;
 
-        _MALLOC_LOCK_INIT();
-
 #ifdef MALLOC_EXTRA_SANITY
         malloc_junk = 1;
 #endif /* MALLOC_EXTRA_SANITY */