aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-02-24 15:44:48 +0100
committerSverker Eriksson <[email protected]>2012-02-24 15:44:48 +0100
commit03ecf626b473e1c0015b1469e71403189f878ebc (patch)
tree72e86c90e9e4471d65668c4289afd5ebbb16ee01
parent1bf37a66d522a6f7d42fbd7602fd1236d586652c (diff)
downloadotp-03ecf626b473e1c0015b1469e71403189f878ebc.tar.gz
otp-03ecf626b473e1c0015b1469e71403189f878ebc.tar.bz2
otp-03ecf626b473e1c0015b1469e71403189f878ebc.zip
erts: Fix faulty assert in non-smp debug vm
"is_blocking" always returns true on non-smp
-rw-r--r--erts/emulator/beam/code_ix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/code_ix.c b/erts/emulator/beam/code_ix.c
index 9158d2d05c..ae4cca1e58 100644
--- a/erts/emulator/beam/code_ix.c
+++ b/erts/emulator/beam/code_ix.c
@@ -104,8 +104,9 @@ void erts_abort_staging_code_ix(void)
int erts_try_seize_code_write_permission(Process* c_p)
{
int success;
-
+#ifdef ERTS_SMP
ASSERT(!erts_smp_thr_progress_is_blocking()); /* to avoid deadlock */
+#endif
erts_smp_mtx_lock(&the_code_ix_queue_lock);
success = !the_code_ix_lock;