aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-12-19 17:16:29 +0100
committerSverker Eriksson <[email protected]>2017-12-19 17:16:29 +0100
commit6725638847b344d68307ef3d12a315d9d188271e (patch)
tree65b97f3638486c3b3909bd3e6edfcc7c3f3a4938 /erts/emulator/beam
parent03c3bde623fdcb6e9ef4d390cc50fc812cb156d9 (diff)
parent7bbfd17a838e5c056b4ed8ff13af5635fc192969 (diff)
downloadotp-6725638847b344d68307ef3d12a315d9d188271e.tar.gz
otp-6725638847b344d68307ef3d12a315d9d188271e.tar.bz2
otp-6725638847b344d68307ef3d12a315d9d188271e.zip
Merge branch 'sverker/cleanup-some-ERTS_SMP'
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/bif.c2
-rw-r--r--erts/emulator/beam/break.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 6684803bb8..0e5f7bb22b 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -248,10 +248,8 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
*/
state = erts_atomic32_read_acqb(&BIF_P->state);
if (state & (ERTS_PSFLG_EXITING|ERTS_PSFLG_PENDING_EXIT)) {
-#ifdef ERTS_SMP
if (state & ERTS_PSFLG_PENDING_EXIT)
erts_handle_pending_exit(BIF_P, ERTS_PROC_LOCK_MAIN);
-#endif
ERTS_BIF_EXITED(BIF_P);
}
BIF_RET(am_true);
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 2bfb481771..2cff05c7f3 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -358,7 +358,7 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
static void
print_garb_info(fmtfn_t to, void *to_arg, Process* p)
{
- /* ERTS_SMP: A scheduler is probably concurrently doing gc... */
+ /* A scheduler is probably concurrently doing gc... */
if (!ERTS_IS_CRASH_DUMPING)
return;
erts_print(to, to_arg, "New heap start: %bpX\n", p->heap);