diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:06:43 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:06:43 +0100 |
| commit | bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861 (patch) | |
| tree | 94dae2ff490c4193df939fc85927ac63af9542e1 /erts/emulator/beam/erl_gc.c | |
| parent | 75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d (diff) | |
| parent | 2b57228dd5993321a217a89dbe601d1e90b18f33 (diff) | |
| download | otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.gz otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.bz2 otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.zip | |
Merge branch 'master' of super:otp
Diffstat (limited to 'erts/emulator/beam/erl_gc.c')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index 8ff6f9a3b9..ab8448e8a1 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -1157,7 +1157,7 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj) old_htop = sweep_one_area(OLD_HTOP(p), old_htop, heap, heap_size); } OLD_HTOP(p) = old_htop; - HIGH_WATER(p) = (HEAP_START(p) != HIGH_WATER(p)) ? n_heap : n_htop; + HIGH_WATER(p) = n_htop; if (MSO(p).first) { sweep_off_heap(p, 0); |