aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <sverker@erlang.org>2017-11-03 19:52:50 +0100
committerSverker Eriksson <sverker@erlang.org>2017-11-03 19:52:50 +0100
commit64101035e025fc44dff5ba3d6ed4668c1e3a698f (patch)
tree5ce0595ea530ac2e0dfbd0bc90e5aadbeffe20c1 /erts/emulator/beam
parent7cd0a910a3d171840991092e335e9a5b2aeee74e (diff)
downloadotp-64101035e025fc44dff5ba3d6ed4668c1e3a698f.tar.gz
otp-64101035e025fc44dff5ba3d6ed4668c1e3a698f.tar.bz2
otp-64101035e025fc44dff5ba3d6ed4668c1e3a698f.zip
erts: Fix lock checking in do_call_trace
which was lost in merge 3ec66701f91eba6a7a12a813b2283c2e733f62c1
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/beam_bp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index fe1e15701b..0832b3f374 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -998,7 +998,9 @@ do_call_trace(Process* c_p, ErtsCodeInfo* info, Eterm* reg,
fixup_cp_before_trace(c_p, &return_to_trace);
+ ERTS_UNREQ_PROC_MAIN_LOCK(c_p);
flags = erts_call_trace(c_p, info, ms, reg, local, &tracer);
+ ERTS_REQ_PROC_MAIN_LOCK(c_p);
/* restore cp after potential fixup */
c_p->cp = cp_save;