1 files changed, 10 insertions, 35 deletions
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 8077de4..2ee758e 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -196,11 +196,20 @@ GetCache(void)
 
     if (listLockPtr == NULL) {
 	Tcl_Mutex *initLockPtr;
+	unsigned int i;
 
 	initLockPtr = Tcl_GetAllocMutex();
 	Tcl_MutexLock(initLockPtr);
 	if (listLockPtr == NULL) {
-	    TclInitThreadAlloc();
+	    listLockPtr = TclpNewAllocMutex();
+	    objLockPtr = TclpNewAllocMutex();
+	    for (i = 0; i < NBUCKETS; ++i) {
+		bucketInfo[i].blockSize = MINALLOC << i;
+		bucketInfo[i].maxBlocks = 1 << (NBUCKETS - 1 - i);
+		bucketInfo[i].numMove = i < NBUCKETS - 1 ?
+			1 << (NBUCKETS - 2 - i) : 1;
+		bucketInfo[i].lockPtr = TclpNewAllocMutex();
+	    }
 	}
 	Tcl_MutexUnlock(initLockPtr);
     }
@@ -1055,40 +1064,6 @@ GetBlocks(
     }
     return 1;
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitThreadAlloc --
- *
- *	Initializes the allocator cache-maintenance structures.
- *      It is done early and protected during the TclInitSubsystems().
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitThreadAlloc(void)
-{
-    unsigned int i;
-
-    listLockPtr = TclpNewAllocMutex();
-    objLockPtr = TclpNewAllocMutex();
-    for (i = 0; i < NBUCKETS; ++i) {
-	bucketInfo[i].blockSize = MINALLOC << i;
-	bucketInfo[i].maxBlocks = 1 << (NBUCKETS - 1 - i);
-	bucketInfo[i].numMove = i < NBUCKETS - 1 ?
-		1 << (NBUCKETS - 2 - i) : 1;
-	bucketInfo[i].lockPtr = TclpNewAllocMutex();
-    }
-    TclpInitAllocCache();
-}
 
 /*
  *----------------------------------------------------------------------