diff options
| author | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
| commit | 1f1d20a352d16741c272f14dd7d09632eef13509 (patch) | |
| tree | eab34f895460ee92a3ebcbf6e2d813e1384e65e0 /erts/emulator/sys/unix/sys_time.c | |
| parent | af4f81a46d895c8a217c104c874a912073728374 (diff) | |
| parent | 5a537ae41c2295f7f19e4e01fe90acc7585f5b30 (diff) | |
| download | otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.gz otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.bz2 otp-1f1d20a352d16741c272f14dd7d09632eef13509.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/sys/unix/sys_time.c')
| -rw-r--r-- | erts/emulator/sys/unix/sys_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys_time.c b/erts/emulator/sys/unix/sys_time.c index 4f26639703..102ef7bebf 100644 --- a/erts/emulator/sys/unix/sys_time.c +++ b/erts/emulator/sys/unix/sys_time.c @@ -304,8 +304,8 @@ sys_init_time(ErtsSysInitTimeResult *init_resp) erts_sys_time_data__.r.o.os_times = clock_gettime_times_verified; #endif - erts_smp_mtx_init(&internal_state.w.f.mtx, - "os_monotonic_time"); + erts_smp_mtx_init(&internal_state.w.f.mtx, "os_monotonic_time", NIL, + ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_IO); internal_state.w.f.last_delivered = clock_gettime_monotonic(); init_resp->os_monotonic_time_info.locked_use = 1; |