aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-12-12 14:54:29 +0100
committerSverker Eriksson <[email protected]>2017-12-12 14:54:29 +0100
commit7bbfd17a838e5c056b4ed8ff13af5635fc192969 (patch)
tree18256a213a4bca23d922e1946ae7cca365665895 /erts/emulator
parent18a08499db5223dfc3c96b64220a4b3e6a79c799 (diff)
downloadotp-7bbfd17a838e5c056b4ed8ff13af5635fc192969.tar.gz
otp-7bbfd17a838e5c056b4ed8ff13af5635fc192969.tar.bz2
otp-7bbfd17a838e5c056b4ed8ff13af5635fc192969.zip
erts: Remove some straggling ERTS_SMP
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/bif.c2
-rw-r--r--erts/emulator/beam/break.c2
-rw-r--r--erts/emulator/hipe/hipe_mkliterals.c1
3 files changed, 1 insertions, 4 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 50699eac31..0c88c39cbc 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -247,10 +247,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);
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c
index 84889b3376..d115dfaeea 100644
--- a/erts/emulator/hipe/hipe_mkliterals.c
+++ b/erts/emulator/hipe/hipe_mkliterals.c
@@ -471,7 +471,6 @@ static const struct rts_param rts_params[] = {
0
#endif
},
- /* This parameter is always defined, but its value depends on ERTS_SMP. */
{ 19, "MSG_MESSAGE",
1, offsetof(struct erl_mesg, m[0])
},