aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-02-22 18:25:49 +0100
committerSverker Eriksson <[email protected]>2016-02-22 18:25:49 +0100
commit167675dcb94e3809a224d3b4293594717cec48d9 (patch)
tree6fbeefe294c4550e02aab0a0dbcae386b4c09bad
parentb8cd565e69ee2affbfeee3a9d924265b9222edb9 (diff)
parent5c1d88266274d40a8702a8f66c8cbd4e0f0c15f3 (diff)
downloadotp-167675dcb94e3809a224d3b4293594717cec48d9.tar.gz
otp-167675dcb94e3809a224d3b4293594717cec48d9.tar.bz2
otp-167675dcb94e3809a224d3b4293594717cec48d9.zip
Merge branch 'maint'
-rw-r--r--erts/emulator/beam/erl_process_lock.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h
index a64c993e8f..9c59301086 100644
--- a/erts/emulator/beam/erl_process_lock.h
+++ b/erts/emulator/beam/erl_process_lock.h
@@ -523,6 +523,10 @@ erts_smp_proc_lock__(Process *p,
ERTS_LC_ASSERT((locks & ~ERTS_PROC_LOCKS_ALL) == 0);
+#ifdef ERTS_ENABLE_LOCK_CHECK
+ erts_proc_lc_lock(p, locks, file, line);
+#endif
+
old_lflgs = erts_smp_proc_raw_trylock__(p, locks);
if (old_lflgs != 0) {
@@ -544,9 +548,6 @@ erts_smp_proc_lock__(Process *p,
#ifdef ERTS_ENABLE_LOCK_COUNT
erts_lcnt_proc_lock_post_x(&(p->lock), locks, file, line);
#endif
-#ifdef ERTS_ENABLE_LOCK_CHECK
- erts_proc_lc_lock(p, locks, file, line);
-#endif
#ifdef ERTS_PROC_LOCK_DEBUG
erts_proc_lock_op_debug(p, locks, 1);