aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-05-05 17:32:58 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-05-05 17:32:58 +0200
commitdcffa010ef304c4dbb2e830103b7ca87fb7b62b0 (patch)
treeb53e33c3af780ff9e15f1464faf995c2cbcad280
parenta3fce1683d39d41fd746db42363a6c69aaf37abc (diff)
parent6bef0d08142e961d562a7fce4d8b036a32b2b98b (diff)
downloadotp-dcffa010ef304c4dbb2e830103b7ca87fb7b62b0.tar.gz
otp-dcffa010ef304c4dbb2e830103b7ca87fb7b62b0.tar.bz2
otp-dcffa010ef304c4dbb2e830103b7ca87fb7b62b0.zip
Merge branch 'egil/fix-tmp-alloc-fd-async/OTP-12710'
* egil/fix-tmp-alloc-fd-async/OTP-12710: erts: Use a lockable allocator on 'sys_write_buf'
-rw-r--r--erts/emulator/beam/erl_alloc.types5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index e2f8da38b9..074f864dee 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -419,7 +419,12 @@ type ENVIRONMENT TEMPORARY SYSTEM environment
type PUTENV_STR SYSTEM SYSTEM putenv_string
type PRT_REP_EXIT STANDARD SYSTEM port_report_exit
type SYS_BLOCKING STANDARD SYSTEM sys_blocking
+
++if smp
type SYS_WRITE_BUF TEMPORARY SYSTEM sys_write_buf
++else
+type SYS_WRITE_BUF BINARY SYSTEM sys_write_buf
++endif
+endif