diff options
| author | Lukas Larsson <[email protected]> | 2019-01-23 11:20:06 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-23 11:20:06 +0100 |
| commit | e67375f81ea2a2e2f9fe701191646c2af8c7cc91 (patch) | |
| tree | 678c213c337bcfbba839a1c0801475189b1b1aca /erts | |
| parent | cacf240d0f722c5c4cb9e4abf3c21a306a48b6c7 (diff) | |
| parent | 1618464b1c399b7739529ae6ab182a0cdebcc84e (diff) | |
| download | otp-e67375f81ea2a2e2f9fe701191646c2af8c7cc91.tar.gz otp-e67375f81ea2a2e2f9fe701191646c2af8c7cc91.tar.bz2 otp-e67375f81ea2a2e2f9fe701191646c2af8c7cc91.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c index 701fb38147..ae7084b7f4 100644 --- a/erts/emulator/beam/erl_trace.c +++ b/erts/emulator/beam/erl_trace.c @@ -72,7 +72,7 @@ static ErtsTracer default_port_tracer; static Eterm system_monitor; static Eterm system_profile; -static erts_aint_t system_logger; +static erts_atomic_t system_logger; #ifdef HAVE_ERTS_NOW_CPU int erts_cpu_timestamp; |