aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-09-25 17:15:27 +0200
committerRickard Green <[email protected]>2014-09-25 17:15:27 +0200
commit3b972c26208c99282215766c3716ae23a1ac6214 (patch)
tree89312b5b944dc3b69a89d1b6b77f6392d7097f21 /erts/preloaded/src
parentf4a57a8e94b9eb5f21adfd1c8da62429a3cb35c1 (diff)
parent404c44d58058da8cfead5dd310fcb24bf3e8d344 (diff)
downloadotp-3b972c26208c99282215766c3716ae23a1ac6214.tar.gz
otp-3b972c26208c99282215766c3716ae23a1ac6214.tar.bz2
otp-3b972c26208c99282215766c3716ae23a1ac6214.zip
Merge branch 'rickard/maint-17/eager-check-io/OTP-12117' into rickard/master/eager-check-io/OTP-12117
* rickard/maint-17/eager-check-io/OTP-12117: No eager check I/O on OSE Introduce support for eager check I/O scheduling Conflicts: erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/erlang.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index b96a601792..83a38da26b 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2239,6 +2239,7 @@ tuple_to_list(_Tuple) ->
(dynamic_trace) -> none | dtrace | systemtap;
(dynamic_trace_probes) -> boolean();
(elib_malloc) -> false;
+ (eager_check_io) -> boolean();
(ets_limit) -> pos_integer();
(fullsweep_after) -> {fullsweep_after, non_neg_integer()};
(garbage_collection) -> [{atom(), integer()}];