diff options
| author | Rickard Green <[email protected]> | 2016-11-23 14:15:55 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-11-23 14:15:55 +0100 |
| commit | 2b663d3ff96c74fa87be1120f3cd8960318080a1 (patch) | |
| tree | 24eb224fe6335671596d7c490bd2255863035393 /erts/emulator/beam/erl_process.h | |
| parent | 9cac4f15d84a7682f17dee01c0ce4a12bac5d9ff (diff) | |
| parent | ad94a4bdb24c93d3cafc7351c4c98f346a5f53cc (diff) | |
| download | otp-2b663d3ff96c74fa87be1120f3cd8960318080a1.tar.gz otp-2b663d3ff96c74fa87be1120f3cd8960318080a1.tar.bz2 otp-2b663d3ff96c74fa87be1120f3cd8960318080a1.zip | |
Merge branch 'rickard/nif-scheduling-fixes' into maint
* rickard/nif-scheduling-fixes:
Fix check_process_code() when NifExport is in use - OTP-14048
Fix GC when NifExport is in use - OTP-14049
Fix saving of original arguments when rescheduling via NifExport - OTP-14050
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 9e5121abd5..d7eff3605a 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1586,6 +1586,7 @@ Uint64 erts_step_proc_interval(void); int erts_setup_nif_gc(Process* proc, Eterm** objv, int* nobj); /* see erl_nif.c */ void erts_destroy_nif_export(void *); /* see erl_nif.c */ +int erts_check_nif_export_in_area(Process *p, char *start, Uint size); ErtsProcList *erts_proclist_create(Process *); ErtsProcList *erts_proclist_copy(ErtsProcList *); |