svn commit: r326740 - head/contrib/jemalloc/include/jemalloc/internal

[Michal Meloun]

Author: mmel
Date: Sun Dec 10 08:55:48 2017
New Revision: 326740
URL: https://svnweb.freebsd.org/changeset/base/326740

Log:
  Relax too restrictive assert.
  
  The problem has been reported to upstream and similar change will
  be included in next jemalloc release.
  
  Submitted by:	David Goldblatt <davidtgoldblatt at gmail.com>
  MFC after: 	2 weeks

Modified:
  head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h

Modified: head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h	Sun Dec 10 04:43:27 2017	(r326739)
+++ head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h	Sun Dec 10 08:55:48 2017	(r326740)
@@ -91,9 +91,11 @@ idalloctm(tsdn_t *tsdn, void *ptr, tcache_t *tcache, a
 	if (config_stats && is_internal) {
 		arena_internal_sub(iaalloc(tsdn, ptr), isalloc(tsdn, ptr));
 	}
+#if 0
 	if (!is_internal && tsd_reentrancy_level_get(tsdn_tsd(tsdn)) != 0) {
 		assert(tcache == NULL);
 	}
+#endif
 	arena_dalloc(tsdn, ptr, tcache, alloc_ctx, slow_path);
 }