aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-01-23 11:19:21 +0100
committerLukas Larsson <[email protected]>2019-01-23 11:19:21 +0100
commit1618464b1c399b7739529ae6ab182a0cdebcc84e (patch)
tree5318e66ad26f0eb995807849de9e4f0a98d421b3 /erts/emulator
parentaba6a2c2b5ae9dca21c5e14f5c25b175c6b67782 (diff)
parent131c4fc67facf69e2e084d6ceb81a0778eecfa63 (diff)
downloadotp-1618464b1c399b7739529ae6ab182a0cdebcc84e.tar.gz
otp-1618464b1c399b7739529ae6ab182a0cdebcc84e.tar.bz2
otp-1618464b1c399b7739529ae6ab182a0cdebcc84e.zip
Merge branch 'lukas/erts/set_logger_process/OTP-15375' into maint
* lukas/erts/set_logger_process/OTP-15375: erts: Fix type of system_logger variable
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_trace.c2
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;