aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_process.h
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-02-25 15:53:48 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-02-25 16:04:33 +0100
commit8ead4dbf8a2f73325dbc3113abf2e5dd4f885bb2 (patch)
tree0b3ba7d2c7d6702e685e0fa5ef64bab0b710055d /erts/emulator/beam/erl_process.h
parent023f096db6c225499b7af0fdea984a078bd660f9 (diff)
parent93d2038e91854d4bc4fd75dac7005719a79949cd (diff)
downloadotp-8ead4dbf8a2f73325dbc3113abf2e5dd4f885bb2.tar.gz
otp-8ead4dbf8a2f73325dbc3113abf2e5dd4f885bb2.tar.bz2
otp-8ead4dbf8a2f73325dbc3113abf2e5dd4f885bb2.zip
Merge branch 'maint'
Conflicts: erts/emulator/beam/erl_alloc.types erts/emulator/beam/erl_bif_info.c erts/emulator/beam/erl_process.c erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
-rw-r--r--erts/emulator/beam/erl_process.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index ef4aab7234..0c7ad74614 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -1523,6 +1523,7 @@ void erts_init_scheduling(int, int
int erts_set_gc_state(Process *c_p, int enable);
Eterm erts_sched_wall_time_request(Process *c_p, int set, int enable);
+Eterm erts_system_check_request(Process *c_p);
Eterm erts_gc_info_request(Process *c_p);
Uint64 erts_get_proc_interval(void);
Uint64 erts_ensure_later_proc_interval(Uint64);