diff options
| author | Lukas Larsson <[email protected]> | 2016-04-26 09:53:59 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-04-26 09:53:59 +0200 |
| commit | 04d15ab3de2580ce9e62bd1799253a86fcb32481 (patch) | |
| tree | 234f2f8db5e05a20c33e4454b79da55ddb5fb99f /erts/emulator/beam/erl_hl_timer.c | |
| parent | 7d000278728f5f8940d02fe9798735820baa79e5 (diff) | |
| parent | 303bacbea8e977743c9e6b02c8d9fabe081de669 (diff) | |
| download | otp-04d15ab3de2580ce9e62bd1799253a86fcb32481.tar.gz otp-04d15ab3de2580ce9e62bd1799253a86fcb32481.tar.bz2 otp-04d15ab3de2580ce9e62bd1799253a86fcb32481.zip | |
Merge branch 'lukas/erts/non-smp-debug-fixes/OTP-13047'
* lukas/erts/non-smp-debug-fixes/OTP-13047:
erts: Fix incorrect non-smp debug assert
erts: std_alloc is not thread safe on non-smp
Conflicts:
erts/emulator/beam/erl_alloc_util.c
Diffstat (limited to 'erts/emulator/beam/erl_hl_timer.c')
0 files changed, 0 insertions, 0 deletions