diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-05 15:26:59 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-05 15:26:59 +0200 |
| commit | 620b7e879c9943e1e79990ed0a825228f7b18b04 (patch) | |
| tree | 25369d6a3e75937ecae7606ff71aa770126b7c26 /erts/emulator/beam | |
| parent | 33e423efdbef88087ba4205d56e6d9f608d43e50 (diff) | |
| parent | ab22a60d4e8d7a433789bae44b53305ad0d44cdc (diff) | |
| download | otp-620b7e879c9943e1e79990ed0a825228f7b18b04.tar.gz otp-620b7e879c9943e1e79990ed0a825228f7b18b04.tar.bz2 otp-620b7e879c9943e1e79990ed0a825228f7b18b04.zip | |
Merge branch 'pan/win_now_jumps' into maint
* pan/win_now_jumps:
Enable use of GetTickCoun64 when available
Intermediate code with lock on gettickcount()
Tmp
OTP-11146
Diffstat (limited to 'erts/emulator/beam')
| -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 } }; |