diff options
author | Rickard Green <[email protected]> | 2017-02-06 18:18:30 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-02-06 18:18:30 +0100 |
commit | 888c889714569a142525505c914f577135a46ec9 (patch) | |
tree | 5d7e01b55e85b7a020d8e4529c3a2e863f5f97f5 /erts/emulator/beam/erl_fun.h | |
parent | 716406856f6c5681b210ddf1908d398a08f55168 (diff) | |
parent | 83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (diff) | |
download | otp-888c889714569a142525505c914f577135a46ec9.tar.gz otp-888c889714569a142525505c914f577135a46ec9.tar.bz2 otp-888c889714569a142525505c914f577135a46ec9.zip |
Merge branch 'maint'
* maint:
Atomic reference count of binaries also in non-SMP
Conflicts:
erts/emulator/beam/erl_fun.c
Diffstat (limited to 'erts/emulator/beam/erl_fun.h')
-rw-r--r-- | erts/emulator/beam/erl_fun.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_fun.h b/erts/emulator/beam/erl_fun.h index 83899f24a6..e3073eb874 100644 --- a/erts/emulator/beam/erl_fun.h +++ b/erts/emulator/beam/erl_fun.h @@ -42,7 +42,7 @@ typedef struct erl_fun_entry { Uint arity; /* The arity of the fun. */ Eterm module; /* Tagged atom for module. */ - erts_refc_t refc; /* Reference count: One for code + one for each + erts_smp_refc_t refc; /* Reference count: One for code + one for each fun object in each process. */ BeamInstr *pend_purge_address; /* address stored during a pending purge */ #ifdef HIPE |