diff options
| author | Rickard Green <[email protected]> | 2014-03-20 16:05:24 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-03-20 16:05:24 +0100 |
| commit | 164b0bb8b6ad3f065b520996296253b5dbe25f6b (patch) | |
| tree | c110ed4409a614a8e57b7532e7da52e38f0acbf4 /erts/emulator/beam | |
| parent | eb44d0b913a97bf460ba890b04900096f79dcd53 (diff) | |
| parent | 8b4b4a026041bfbe5a8b4e2535c5fd0804b18103 (diff) | |
| download | otp-164b0bb8b6ad3f065b520996296253b5dbe25f6b.tar.gz otp-164b0bb8b6ad3f065b520996296253b5dbe25f6b.tar.bz2 otp-164b0bb8b6ad3f065b520996296253b5dbe25f6b.zip | |
Merge branch 'vinoski/ds-enif-send'
* vinoski/ds-enif-send:
enable enif_send to work from a dirty scheduler
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h index 942eaa47d0..d3109b9432 100644 --- a/erts/emulator/beam/erl_alloc.h +++ b/erts/emulator/beam/erl_alloc.h @@ -492,7 +492,7 @@ static TYPE * \ NAME##_alloc(void) \ { \ ErtsSchedulerData *esdp = erts_get_scheduler_data(); \ - if (!esdp) \ + if (!esdp || ERTS_SCHEDULER_IS_DIRTY(esdp)) \ return NULL; \ return (TYPE *) erts_sspa_alloc(sspa_data_##NAME##__, \ (int) esdp->no - 1); \ |