diff options
| author | Henrik Nord <[email protected]> | 2013-12-02 15:51:11 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2013-12-02 15:51:11 +0100 |
| commit | 471abeb72af964049fcd3ed169d1bca7c5534d4c (patch) | |
| tree | 62a18a1780b71aa285b44e703501587ded10ea05 /erts/emulator/beam/erl_alloc_util.c | |
| parent | 026a9226fcd47d29870f5b5d879919ce4f60d785 (diff) | |
| parent | 25b992335e82919d6166b860c9b97710c5f33ae1 (diff) | |
| download | otp-471abeb72af964049fcd3ed169d1bca7c5534d4c.tar.gz otp-471abeb72af964049fcd3ed169d1bca7c5534d4c.tar.bz2 otp-471abeb72af964049fcd3ed169d1bca7c5534d4c.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index 3914537d0d..c6cea0185f 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -3570,7 +3570,6 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags) /* Old carrier unchanged; restore... */ STAT_SYS_ALLOC_SBC_ALLOC(allctr, old_crr_sz, old_blk_sz); } - DEBUG_SAVE_ALIGNMENT(new_crr); return new_blk; } #endif |