diff options
| author | Rickard Green <[email protected]> | 2014-09-25 17:15:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-09-25 17:15:27 +0200 |
| commit | 3b972c26208c99282215766c3716ae23a1ac6214 (patch) | |
| tree | 89312b5b944dc3b69a89d1b6b77f6392d7097f21 /erts/emulator/beam/utils.c | |
| parent | f4a57a8e94b9eb5f21adfd1c8da62429a3cb35c1 (diff) | |
| parent | 404c44d58058da8cfead5dd310fcb24bf3e8d344 (diff) | |
| download | otp-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/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 55f9e68e78..f20e6e5665 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -48,6 +48,7 @@ #include "erl_sched_spec_pre_alloc.h" #include "beam_bp.h" #include "erl_ptab.h" +#include "erl_check_io.h" #undef M_TRIM_THRESHOLD #undef M_TOP_PAD |