diff options
-rw-r--r-- | src/lib/libc/include/thread_private.h | 6 | ||||
-rw-r--r-- | src/lib/libc/stdlib/malloc.c | 4 |
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 @@ | |||
1 | /* $OpenBSD: thread_private.h,v 1.22 2008/01/01 00:43:39 kurt Exp $ */ | 1 | /* $OpenBSD: thread_private.h,v 1.23 2008/06/13 21:18:42 otto Exp $ */ |
2 | 2 | ||
3 | /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */ | 3 | /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */ |
4 | 4 | ||
@@ -133,10 +133,6 @@ void _thread_malloc_unlock(void); | |||
133 | if (__isthreaded) \ | 133 | if (__isthreaded) \ |
134 | _thread_malloc_unlock();\ | 134 | _thread_malloc_unlock();\ |
135 | } while (0) | 135 | } while (0) |
136 | #define _MALLOC_LOCK_INIT() do { \ | ||
137 | if (__isthreaded) \ | ||
138 | _thread_malloc_init();\ | ||
139 | } while (0) | ||
140 | 136 | ||
141 | void _thread_atexit_lock(void); | 137 | void _thread_atexit_lock(void); |
142 | void _thread_atexit_unlock(void); | 138 | 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 @@ | |||
1 | /* $OpenBSD: malloc.c,v 1.90 2008/05/19 19:36:15 otto Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.91 2008/06/13 21:18:42 otto Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * ---------------------------------------------------------------------------- | 4 | * ---------------------------------------------------------------------------- |
@@ -656,8 +656,6 @@ malloc_init(void) | |||
656 | char *p, b[64]; | 656 | char *p, b[64]; |
657 | int i, j, save_errno = errno; | 657 | int i, j, save_errno = errno; |
658 | 658 | ||
659 | _MALLOC_LOCK_INIT(); | ||
660 | |||
661 | #ifdef MALLOC_EXTRA_SANITY | 659 | #ifdef MALLOC_EXTRA_SANITY |
662 | malloc_junk = 1; | 660 | malloc_junk = 1; |
663 | #endif /* MALLOC_EXTRA_SANITY */ | 661 | #endif /* MALLOC_EXTRA_SANITY */ |