diff options
| author | Rickard Green <[email protected]> | 2017-02-06 18:18:30 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-02-06 18:18:30 +0100 |
| commit | 888c889714569a142525505c914f577135a46ec9 (patch) | |
| tree | 5d7e01b55e85b7a020d8e4529c3a2e863f5f97f5 /erts/emulator/beam/beam_load.c | |
| parent | 716406856f6c5681b210ddf1908d398a08f55168 (diff) | |
| parent | 83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (diff) | |
| download | otp-888c889714569a142525505c914f577135a46ec9.tar.gz otp-888c889714569a142525505c914f577135a46ec9.tar.bz2 otp-888c889714569a142525505c914f577135a46ec9.zip | |
Merge branch 'maint'
* maint:
Atomic reference count of binaries also in non-SMP
Conflicts:
erts/emulator/beam/erl_fun.c
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index d298a4ff26..9f38dd4c3a 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -4862,7 +4862,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 @@ -6274,7 +6274,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)) |