aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-11-27 14:45:02 +0100
committerBjörn Gustavsson <[email protected]>2017-11-27 14:46:28 +0100
commit5833bc53f9b785146a58d17fc171a5f049ac1cb7 (patch)
tree12fd81b36d84c0ec9e0530e8504ca8d54c1811a5 /erts/emulator
parent4b1e7bca931198e010b33773f57e6e84b92ae007 (diff)
downloadotp-5833bc53f9b785146a58d17fc171a5f049ac1cb7.tar.gz
otp-5833bc53f9b785146a58d17fc171a5f049ac1cb7.tar.bz2
otp-5833bc53f9b785146a58d17fc171a5f049ac1cb7.zip
erts: Fix bad merge of PR #1644
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/beam_load.c2
-rw-r--r--erts/emulator/beam/erl_gc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 82a8ddd78c..e43f7fda2c 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -6040,7 +6040,7 @@ erts_release_literal_area(ErtsLiteralArea* literal_area)
case FUN_SUBTAG:
{
ErlFunEntry* fe = ((ErlFunThing*)oh)->fe;
- if (erts_smp_refc_dectest(&fe->refc, 0) == 0) {
+ if (erts_refc_dectest(&fe->refc, 0) == 0) {
erts_erase_fun_entry(fe);
}
break;
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index a75856bfc9..0da4468f9c 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -1263,7 +1263,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
ExternalThing *etp;
ASSERT(is_external_header(ptr->thing_word));
etp = (ExternalThing *) ptr;
- erts_smp_refc_inc(&etp->node->refc, 1);
+ erts_refc_inc(&etp->node->refc, 1);
break;
}
}