aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_lock_check.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-07-12 16:17:42 +0200
committerSverker Eriksson <[email protected]>2011-07-12 16:17:42 +0200
commit66829b77b0becadecb2fef480b66f69e95498bf7 (patch)
tree0831a7255d5b2b5e024cbe0f00856ae3e4aa1fec /erts/emulator/beam/erl_lock_check.c
parent80865e03583ebbee63a2a72be708f28c1e4a4f98 (diff)
parent089b8c357f5e7c96605c8f8cab4b3c856081dc39 (diff)
downloadotp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.gz
otp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.bz2
otp-66829b77b0becadecb2fef480b66f69e95498bf7.zip
Merge branch 'dev' into major
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
-rw-r--r--erts/emulator/beam/erl_lock_check.c1
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