diff options
| author | Rickard Green <[email protected]> | 2014-08-28 21:30:44 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-28 21:30:44 +0200 |
| commit | e59ea3efb5eafcda94fec0f838f2062db47acbcd (patch) | |
| tree | e86f4e1a66a18194446a294b2fe3caae1de33b02 /erts/emulator/beam/beam_load.c | |
| parent | 13758c27667f2a8859796baf0a19ca4d759390d5 (diff) | |
| parent | feb45017da36be78d4c5784d758ede619fa7bfd3 (diff) | |
| download | otp-e59ea3efb5eafcda94fec0f838f2062db47acbcd.tar.gz otp-e59ea3efb5eafcda94fec0f838f2062db47acbcd.tar.bz2 otp-e59ea3efb5eafcda94fec0f838f2062db47acbcd.zip | |
Merge branch 'maint'
* maint:
add enif_schedule_nif() to NIF API
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index a4e72a130a..07654f6d5c 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -2365,7 +2365,11 @@ load_code(LoaderState* stp) if (stp->may_load_nif) { const int finfo_ix = ci - FUNC_INFO_SZ; - enum { MIN_FUNC_SZ = 3 }; +#ifdef ERTS_DIRTY_SCHEDULERS + enum { MIN_FUNC_SZ = 4 }; +#else + enum { MIN_FUNC_SZ = 3 }; +#endif if (finfo_ix - last_func_start < MIN_FUNC_SZ && last_func_start) { /* Must make room for call_nif op */ int pad = MIN_FUNC_SZ - (finfo_ix - last_func_start); |