diff options
| author | Erlang/OTP <[email protected]> | 2011-07-11 15:40:42 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-07-11 15:40:42 +0200 |
| commit | 3b2f96b9a1f079c9e0502db7d11984597ea5c4f1 (patch) | |
| tree | eb14eeaeda15e219244540f0d270f212a5dc9554 /erts/emulator/beam/erl_lock_check.c | |
| parent | e0f60ce445b072b97353f3ab8f18c2f00b04cbe8 (diff) | |
| parent | 1dfaae304dfcc4f249c62b5ab7ff3bd4acef0d50 (diff) | |
| download | otp-3b2f96b9a1f079c9e0502db7d11984597ea5c4f1.tar.gz otp-3b2f96b9a1f079c9e0502db7d11984597ea5c4f1.tar.bz2 otp-3b2f96b9a1f079c9e0502db7d11984597ea5c4f1.zip | |
Merge branch 'rickard/sbmbc/OTP-9339' into maint-r14
* rickard/sbmbc/OTP-9339:
Use separate memory carriers for small blocks
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index 9180508a49..587d82f2bb 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -153,6 +153,7 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "instr", NULL }, { "fix_alloc", "index" }, { "alcu_allocator", "index" }, + { "sbmbc_alloc", "index" }, { "alcu_delayed_free", "index" }, { "mseg", NULL }, #if HALFWORD_HEAP |