aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/io.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-05-03 15:52:36 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-05-03 15:52:36 +0200
commit10cf76e07b3105d6e4355f07a96e2dcc9d1efcda (patch)
treed2962204e5fa8cfb9bd87e1e50de1c73a5e25339 /erts/emulator/beam/io.c
parent42c6436eb39dee7289f9dd03532015a1288ecafa (diff)
parent95194afd63545c7d60e31b5148584f0707034347 (diff)
downloadotp-10cf76e07b3105d6e4355f07a96e2dcc9d1efcda.tar.gz
otp-10cf76e07b3105d6e4355f07a96e2dcc9d1efcda.tar.bz2
otp-10cf76e07b3105d6e4355f07a96e2dcc9d1efcda.zip
Merge branch 'egil/erts/doc-lttng-beam-tps/OTP-10282'
* egil/erts/doc-lttng-beam-tps/OTP-10282: erts: Rename LTTng tracepoint aio_pool_add to aio_pool_put erts: Change argument order for LTTng driver_stop runtime_tools: Document BEAM lttng tracepoints
Diffstat (limited to 'erts/emulator/beam/io.c')
-rw-r--r--erts/emulator/beam/io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index b14ca77a04..5c2595c69d 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -3861,7 +3861,7 @@ terminate_port(Port *prt)
lttng_decl_procbuf(proc_str);
lttng_pid_to_str(connected_id, proc_str);
lttng_port_to_str(prt, port_str);
- LTTNG3(driver_stop, proc_str, drv->name, port_str);
+ LTTNG3(driver_stop, proc_str, port_str, drv->name);
}
#endif