diff options
| author | Sverker Eriksson <[email protected]> | 2011-03-10 17:33:06 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-03-10 17:33:06 +0100 |
| commit | df454656f37296a47834ba8b01ec54f3638addba (patch) | |
| tree | 8af160767fa201081aa5f6d5f3209617078af180 /erts/emulator/beam/global.h | |
| parent | 82106ef01f26a1d1a862b7f57fc580cbe46428b2 (diff) | |
| parent | 5cddff325916c16487c0be91019ab737b3cfae3d (diff) | |
| download | otp-df454656f37296a47834ba8b01ec54f3638addba.tar.gz otp-df454656f37296a47834ba8b01ec54f3638addba.tar.bz2 otp-df454656f37296a47834ba8b01ec54f3638addba.zip | |
Merge branch 'pg/fix-hibernate-with-hipe' into dev
* pg/fix-hibernate-with-hipe:
Update copyright years
Fix NULL-free bug in hibernate on debug emulator
Fix several bugs related to hibernate/3 and HiPE
Conflicts:
erts/emulator/test/hibernate_SUITE.erl
OTP-9125
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index bd540eaaa6..40cb634e11 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1700,6 +1700,7 @@ Uint erts_current_reductions(Process* current, Process *p); int erts_print_system_version(int to, void *arg, Process *c_p); +int erts_hibernate(Process* c_p, Eterm module, Eterm function, Eterm args, Eterm* reg); #define seq_trace_output(token, msg, type, receiver, process) \ seq_trace_output_generic((token), (msg), (type), (receiver), (process), NIL) #define seq_trace_output_exit(token, msg, type, receiver, exitfrom) \ |