aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/unix/sys_drivers.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-04-24 11:33:00 +0200
committerRickard Green <[email protected]>2017-04-24 11:33:00 +0200
commit515dc2d603d449ed3621d96028ba403aef05ea7f (patch)
treea28ea65c6a4ecabebc3d9f539ae552ac3afe8721 /erts/emulator/sys/unix/sys_drivers.c
parent37158d81c8a49d77b8ba32dbc560b3064127e24d (diff)
parente91a9ccc0f95edee164139fa9b6ce2db0cb154b6 (diff)
downloadotp-515dc2d603d449ed3621d96028ba403aef05ea7f.tar.gz
otp-515dc2d603d449ed3621d96028ba403aef05ea7f.tar.bz2
otp-515dc2d603d449ed3621d96028ba403aef05ea7f.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Do not ignore SIGTERM when VM has been started with +Bi Conflicts: OTP_VERSION erts/emulator/sys/unix/sys.c erts/vsn.mk
Diffstat (limited to 'erts/emulator/sys/unix/sys_drivers.c')
-rw-r--r--erts/emulator/sys/unix/sys_drivers.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c
index 400f163652..93cf64719a 100644
--- a/erts/emulator/sys/unix/sys_drivers.c
+++ b/erts/emulator/sys/unix/sys_drivers.c
@@ -204,6 +204,7 @@ erl_sys_late_init(void)
#ifdef ERTS_SMP
erts_mtx_unlock(port->lock);
#endif
+ erts_sys_unix_later_init(); /* Need to be called after forker has been started */
}
/* II. Prototypes */