diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-26 19:58:46 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-26 19:58:46 +0100 |
| commit | cb971e3026082188be7f394ebf29603d5bd08118 (patch) | |
| tree | c0e76c1da2192638d0940fd3139fbd0d5facb88c /erts/emulator/beam/erl_process.c | |
| parent | 3ceb66666d35ccd6ff48fc018a3adc17706fd4cc (diff) | |
| parent | 4e91911aec363d21ea2d6ff7d5f8e1888b0aa8f9 (diff) | |
| download | otp-cb971e3026082188be7f394ebf29603d5bd08118.tar.gz otp-cb971e3026082188be7f394ebf29603d5bd08118.tar.bz2 otp-cb971e3026082188be7f394ebf29603d5bd08118.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 5907dd4567..d0ce9b7249 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -618,11 +618,6 @@ erts_pre_init_process(void) erts_psd_required_locks[ERTS_PSD_SCHED_ID].set_locks = ERTS_PSD_SCHED_ID_SET_LOCKS; - erts_psd_required_locks[ERTS_PSD_DIST_ENTRY].get_locks - = ERTS_PSD_DIST_ENTRY_GET_LOCKS; - erts_psd_required_locks[ERTS_PSD_DIST_ENTRY].set_locks - = ERTS_PSD_DIST_ENTRY_SET_LOCKS; - erts_psd_required_locks[ERTS_PSD_CALL_TIME_BP].get_locks = ERTS_PSD_CALL_TIME_BP_GET_LOCKS; erts_psd_required_locks[ERTS_PSD_CALL_TIME_BP].set_locks @@ -12329,9 +12324,7 @@ erts_continue_exit_process(Process *p) erts_proc_dec_refc(p); } - dep = ((p->flags & F_DISTRIBUTION) - ? ERTS_PROC_SET_DIST_ENTRY(p, ERTS_PROC_LOCKS_ALL, NULL) - : NULL); + dep = (p->flags & F_DISTRIBUTION) ? erts_this_dist_entry : NULL; scb = ERTS_PROC_SET_SAVED_CALLS_BUF(p, ERTS_PROC_LOCKS_ALL, NULL); pbt = ERTS_PROC_SET_CALL_TIME(p, ERTS_PROC_LOCKS_ALL, NULL); nif_export = ERTS_PROC_SET_NIF_TRAP_EXPORT(p, ERTS_PROC_LOCKS_ALL, NULL); @@ -12343,8 +12336,6 @@ erts_continue_exit_process(Process *p) if (dep) { erts_do_net_exits(dep, reason); - if(dep) - erts_deref_dist_entry(dep); } /* |