aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/beam_load.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-02-06 18:16:20 +0100
committerRickard Green <[email protected]>2017-02-06 18:16:20 +0100
commit83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (patch)
treecbc6710e516e7883313ed1c122e4896a17746611 /erts/emulator/beam/beam_load.c
parent047e3bebbe1639e3f2c82431269c0f7100af55af (diff)
parentfc0477a67641b9ba344de595b7fec2431208f8e6 (diff)
downloadotp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.tar.gz
otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.tar.bz2
otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.zip
Merge branch 'rickard/binary-refc' into maint
OTP-14202 * rickard/binary-refc: Atomic reference count of binaries also in non-SMP Conflicts: erts/emulator/beam/beam_bp.c
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
-rw-r--r--erts/emulator/beam/beam_load.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 3f2bdf3f9d..88b6e89a02 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -4867,7 +4867,7 @@ final_touch(LoaderState* stp, struct erl_module_instance* inst_p)
/*
* We are hiding a pointer into older code.
*/
- erts_refc_dec(&fe->refc, 1);
+ erts_smp_refc_dec(&fe->refc, 1);
}
fe->address = code_ptr;
#ifdef HIPE
@@ -6287,7 +6287,7 @@ patch_funentries(Eterm Patchlist)
*
* Reproduced on a debug emulator with stdlib_test/qlc_SUITE:join_merge
*
- * erts_refc_dec(&fe->refc, 1);
+ * erts_smp_refc_dec(&fe->refc, 1);
*/
if (!patch(Addresses, (Uint) fe))