diff options
| author | Rickard Green <[email protected]> | 2017-06-01 20:25:00 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-06-01 20:25:00 +0200 |
| commit | 222fa490201b33c27b2770e265c3e0594ac74959 (patch) | |
| tree | 49a85f2b548e65ed271c9a6e772caf90b8054540 /erts/emulator/beam/beam_bif_load.c | |
| parent | d106c5fffb3832fffbdf99cca905390fe15d489f (diff) | |
| parent | 5f902e2dbc791373d66f4542a153b827d6b34cb7 (diff) | |
| download | otp-222fa490201b33c27b2770e265c3e0594ac74959.tar.gz otp-222fa490201b33c27b2770e265c3e0594ac74959.tar.bz2 otp-222fa490201b33c27b2770e265c3e0594ac74959.zip | |
Merge branch 'rickard/purge-hibernated-19' into rickard/purge-hibernated-20
* rickard/purge-hibernated-19:
Do not GC hibernated process from other processes
Fix check_process_code() on hibernated process
Conflicts:
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
Diffstat (limited to 'erts/emulator/beam/beam_bif_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 5aceae8ffe..007bf99b6e 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -1068,10 +1068,10 @@ return_ok: literal_gc: if (!gc_allowed) - return am_need_gc; + return am_need_gc; if (c_p->flags & F_DISABLE_GC) - return THE_NON_VALUE; + return THE_NON_VALUE; *redsp += erts_garbage_collect_literals(c_p, (Eterm *) literals, lit_bsize, oh, fcalls); |