aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-11-25 09:11:53 +0100
committerRickard Green <[email protected]>2013-11-25 09:11:53 +0100
commitc8f3e4101497ea268f9dde227651e508f02eb90d (patch)
treec8fc234b6c37a6b6ff172071f48d4d423d4c5e02 /erts/emulator
parentf01eb9919311c6566d38c50625518d1b68aca73c (diff)
parentc79eb97831b0f86f3c4237f51757a3aecce1c264 (diff)
downloadotp-c8f3e4101497ea268f9dde227651e508f02eb90d.tar.gz
otp-c8f3e4101497ea268f9dde227651e508f02eb90d.tar.bz2
otp-c8f3e4101497ea268f9dde227651e508f02eb90d.zip
Merge branch 'maint'
* maint: Ensure carrier pool only accessed by schedulers
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_alloc_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index b0fc653f32..9dce7f6505 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -5522,7 +5522,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
erts_atomic_init_nob(&allctr->cpool.stat.carriers_size, 0);
erts_atomic_init_nob(&allctr->cpool.stat.no_carriers, 0);
allctr->cpool.check_limit_count = ERTS_ALC_CPOOL_CHECK_LIMIT_COUNT;
- allctr->cpool.util_limit = init->acul;
+ allctr->cpool.util_limit = init->ts ? 0 : init->acul;
#endif
allctr->sbc_threshold = init->sbct;