diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
| commit | e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816 (patch) | |
| tree | 85311be5c695d5aea5602bb5ba6f8308b3e4b69e /erts/emulator/beam/erl_lock_check.c | |
| parent | a7f0387da9aa6cf469a02caf071e20120d3bad87 (diff) | |
| parent | c6fe4731a9093166ff41d16900d22808b5a68053 (diff) | |
| download | otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.gz otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.bz2 otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index bc59fe55d4..2ac5e24d3a 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -180,6 +180,11 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "efile_drv dtrace mutex", NULL }, #endif { "mtrace_buf", NULL }, +#ifdef __WIN32__ +#ifdef ERTS_SMP + { "sys_gethrtime", NULL }, +#endif +#endif { "erts_alloc_hard_debug", NULL } }; |