diff options
| author | Sverker Eriksson <[email protected]> | 2015-06-15 15:36:02 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-06-15 15:36:02 +0200 |
| commit | 0476714af7f673de941225ed0daee1447935f248 (patch) | |
| tree | af91592c0a3d4cc9933e034db26ed8232ce9827e /erts/emulator/beam/erl_process_lock.c | |
| parent | d9cf4788018c511e844320b437e8baf4ef7380ce (diff) | |
| parent | f5138184479bd16c0ee0a5e583479378451401c8 (diff) | |
| download | otp-0476714af7f673de941225ed0daee1447935f248.tar.gz otp-0476714af7f673de941225ed0daee1447935f248.tar.bz2 otp-0476714af7f673de941225ed0daee1447935f248.zip | |
Merge branch 'hamt_bin2term'
* hamt_bin2term:
erts: Add erts_factory_trim_and_close
erts: Optimize driver_deliver_term
erts: Remove hashmap probabilistic heap overestimation
Conflicts:
erts/emulator/beam/beam_load.c
Diffstat (limited to 'erts/emulator/beam/erl_process_lock.c')
| -rw-r--r-- | erts/emulator/beam/erl_process_lock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process_lock.c b/erts/emulator/beam/erl_process_lock.c index fff267ff2a..b28bc498f6 100644 --- a/erts/emulator/beam/erl_process_lock.c +++ b/erts/emulator/beam/erl_process_lock.c @@ -1003,7 +1003,9 @@ erts_pid2proc_opt(Process *c_p, void erts_proc_lock_init(Process *p) { +#if ERTS_PROC_LOCK_OWN_IMPL || defined(ERTS_PROC_LOCK_DEBUG) int i; +#endif #if ERTS_PROC_LOCK_OWN_IMPL /* We always start with all locks locked */ #if ERTS_PROC_LOCK_ATOMIC_IMPL |