aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-11-10 09:34:51 +0100
committerBruce Yinhe <[email protected]>2014-11-10 09:34:51 +0100
commite25d2283e7607224b94d248ac99ba7a2f3d774c6 (patch)
tree1dd0631389a3d9ddf72c012699e344ac32a1d4a6 /erts/emulator/beam
parent7b803c5fbc69458d3e1dba8a88322c2306f77e44 (diff)
parent6af3ab986ac6561db52b79fb7a6f646c4314c4e2 (diff)
downloadotp-e25d2283e7607224b94d248ac99ba7a2f3d774c6.tar.gz
otp-e25d2283e7607224b94d248ac99ba7a2f3d774c6.tar.bz2
otp-e25d2283e7607224b94d248ac99ba7a2f3d774c6.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam')
-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 caa9eba8a7..198acfd128 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1643,6 +1643,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;
}