diff options
| author | Rickard Green <[email protected]> | 2017-06-08 14:45:52 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-06-08 14:45:52 +0200 |
| commit | eefca18e8bed9f41ce65ae79fb1a5b614accbfde (patch) | |
| tree | 7338c8b44999a6490bfada281110439639091705 /erts/emulator/beam/beam_bif_load.c | |
| parent | 72d8f7f0fa53063d16e82b033a2eae7349bcd662 (diff) | |
| parent | 766294e485cfc0cf982426cccca0428529e589d8 (diff) | |
| download | otp-eefca18e8bed9f41ce65ae79fb1a5b614accbfde.tar.gz otp-eefca18e8bed9f41ce65ae79fb1a5b614accbfde.tar.bz2 otp-eefca18e8bed9f41ce65ae79fb1a5b614accbfde.zip | |
Merge branch 'rickard/purge-hibernated-20'
* rickard/purge-hibernated-20:
Update testcase to check that purge handle hibernated process correct
Do not GC hibernated process from other processes
Fix check_process_code() on hibernated process
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); |