aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSteve Vinoski <[email protected]>2014-03-02 16:48:06 -0500
committerSteve Vinoski <[email protected]>2014-03-10 12:26:20 -0400
commit8b4b4a026041bfbe5a8b4e2535c5fd0804b18103 (patch)
tree7d638627c7859441d277c6d1eff3af7db3ced38c /erts/emulator/beam
parent870737ab657433c5e8751255fe3c4d298202d142 (diff)
downloadotp-8b4b4a026041bfbe5a8b4e2535c5fd0804b18103.tar.gz
otp-8b4b4a026041bfbe5a8b4e2535c5fd0804b18103.tar.bz2
otp-8b4b4a026041bfbe5a8b4e2535c5fd0804b18103.zip
enable enif_send to work from a dirty scheduler
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_alloc.h2
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); \