diff options
| author | Sverker Eriksson <[email protected]> | 2017-12-19 17:16:29 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-12-19 17:16:29 +0100 |
| commit | 6725638847b344d68307ef3d12a315d9d188271e (patch) | |
| tree | 65b97f3638486c3b3909bd3e6edfcc7c3f3a4938 /erts/emulator | |
| parent | 03c3bde623fdcb6e9ef4d390cc50fc812cb156d9 (diff) | |
| parent | 7bbfd17a838e5c056b4ed8ff13af5635fc192969 (diff) | |
| download | otp-6725638847b344d68307ef3d12a315d9d188271e.tar.gz otp-6725638847b344d68307ef3d12a315d9d188271e.tar.bz2 otp-6725638847b344d68307ef3d12a315d9d188271e.zip | |
Merge branch 'sverker/cleanup-some-ERTS_SMP'
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/bif.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/break.c | 2 | ||||
| -rw-r--r-- | erts/emulator/hipe/hipe_mkliterals.c | 1 |
3 files changed, 1 insertions, 4 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); 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]) }, |