From 91566fc079cfaeaf2b424b7f40d6b9d8669d0470 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Thu, 11 Sep 2014 13:15:33 -0700
Subject: [PATCH] Fix mallocx() to always honor MALLOCX_ARENA() when profiling.

---
 src/jemalloc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/jemalloc.c b/src/jemalloc.c
index 9874361e..f6be7514 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -1435,7 +1435,6 @@ imallocx_flags(size_t usize, size_t alignment, bool zero, bool try_tcache,
 	return (imalloct(usize, try_tcache, arena));
 }
 
-
 JEMALLOC_ALWAYS_INLINE_C void *
 imallocx_maybe_flags(size_t size, int flags, size_t usize, size_t alignment,
     bool zero, bool try_tcache, arena_t *arena)
@@ -1455,7 +1454,7 @@ imallocx_prof_sample(size_t size, int flags, size_t usize, size_t alignment,
 	if (usize <= SMALL_MAXCLASS) {
 		assert(((alignment == 0) ? s2u(LARGE_MINCLASS) :
 		    sa2u(LARGE_MINCLASS, alignment)) == LARGE_MINCLASS);
-		p = imalloc(LARGE_MINCLASS);
+		p = imalloct(LARGE_MINCLASS, try_tcache, arena);
 		if (p == NULL)
 			return (NULL);
 		arena_prof_promoted(p, usize);