diff options
| author | Rickard Green <[email protected]> | 2014-08-28 21:28:45 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-28 21:28:45 +0200 |
| commit | feb45017da36be78d4c5784d758ede619fa7bfd3 (patch) | |
| tree | 52eb75973ad04d51b7f584a50e2efd7cc8722e82 /erts/emulator/beam/beam_load.c | |
| parent | e71d52daa322f7a1f8992c0775183fce9b7309ba (diff) | |
| parent | e167bca85a86cc7a149d53da5cdd08b0905e71a6 (diff) | |
| download | otp-feb45017da36be78d4c5784d758ede619fa7bfd3.tar.gz otp-feb45017da36be78d4c5784d758ede619fa7bfd3.tar.bz2 otp-feb45017da36be78d4c5784d758ede619fa7bfd3.zip | |
Merge branch 'vinoski/enif-schedule-nif' into maint
* vinoski/enif-schedule-nif:
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 e96177cfd9..cfc6146b0a 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -2363,7 +2363,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); |