aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-01-31 08:59:41 +0100
committerBjörn Gustavsson <[email protected]>2012-01-31 08:59:41 +0100
commitff48040a8908b6f506f5de64f25c96d012688131 (patch)
tree8f8268b6be3f7fc7a563c5f64cc18d377cd31e81 /erts/emulator/beam
parent3f7a8519e78a5a23aa072f722562beb336a1142a (diff)
parentdacc3570332103d1f37e72463e88a2550010df77 (diff)
downloadotp-ff48040a8908b6f506f5de64f25c96d012688131.tar.gz
otp-ff48040a8908b6f506f5de64f25c96d012688131.tar.bz2
otp-ff48040a8908b6f506f5de64f25c96d012688131.zip
Merge branch 'maint'
* maint: erts: Correct incorrect assertion in erl_alloc_util.c
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_alloc_util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index c32938bdff..2e1a92f61d 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -3956,7 +3956,8 @@ realloc_thr_pref(ErtsAlcType_t type, void *extra, void *p, Uint size,
if (used_allctr->thread_safe && (!force_move
|| used_allctr != pref_allctr))
erts_mtx_lock(&used_allctr->mutex);
- ERTS_SMP_LC_ASSERT(erts_lc_mtx_is_locked(&used_allctr->mutex));
+ ERTS_SMP_LC_ASSERT(!used_allctr->thread_safe ||
+ erts_lc_mtx_is_locked(&used_allctr->mutex));
cpy_size = BLK_SZ(blk);
if (used_allctr->thread_safe && (!force_move
|| used_allctr != pref_allctr))