aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_nif.c
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-11-13 14:17:26 +0100
committerIngela Anderton Andin <[email protected]>2014-11-13 14:17:26 +0100
commit7cf7cad70ec2b10a46b1f1c01a1d609467918492 (patch)
tree49943be69110215a353b8a0c2f68b47098d93ee1 /erts/emulator/beam/erl_nif.c
parent509163307c31bf4f98a638b47ee03a5b99eb2c73 (diff)
parente61f384adff0c9b134750ee239581296d25c10cd (diff)
downloadotp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.gz
otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.bz2
otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.zip
Merge branch 'maint' of git-server:otp into maint
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
-rw-r--r--erts/emulator/beam/erl_nif.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index ede5f335dc..adc3520ebb 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1646,6 +1646,7 @@ init_nif_sched_data(ErlNifEnv* env, NativeFunPtr direct_fp, NativeFunPtr indirec
ep->m = env->mod_nif;
ep->fp = indirect_fp;
proc->freason = TRAP;
+ proc->arity = argc;
return THE_NON_VALUE;
}