Move last bit of zone initialization in zone.c, and lazy-initialize

2 files changed, 1 insertions, 11 deletions

diff --git a/src/jemalloc.c b/src/jemalloc.c
index 5b1e0fd..1deabcd 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -717,17 +717,6 @@ malloc_init_hard(void)
 	return (false);
 }
 
-#ifdef JEMALLOC_ZONE
-JEMALLOC_ATTR(constructor)
-void
-jemalloc_darwin_init(void)
-{
-
-	if (malloc_init_hard() == false)
-		register_zone();
-}
-#endif
-
 /*
  * End initialization functions.
  */
diff --git a/src/zone.c b/src/zone.c
index 9fc87bb..6c1e415 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -166,6 +166,7 @@ zone_force_unlock(malloc_zone_t *zone)
 		jemalloc_postfork_parent();
 }
 
+JEMALLOC_ATTR(constructor)
 void
 register_zone(void)
 {