diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-03-07 12:30:38 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-03-07 12:30:38 +0100 |
| commit | a8c7417e2e1b6e20c1f1a7247a04579b77ce9037 (patch) | |
| tree | 5bf9457d6da3febe314d1590d4ad7829be80e51a /erts/emulator | |
| parent | 8bbe5fadb386ef50f1efbb9c2938444548b13e09 (diff) | |
| parent | 8863da254d951d1937c6a6a5ef55228be174eced (diff) | |
| download | otp-a8c7417e2e1b6e20c1f1a7247a04579b77ce9037.tar.gz otp-a8c7417e2e1b6e20c1f1a7247a04579b77ce9037.tar.bz2 otp-a8c7417e2e1b6e20c1f1a7247a04579b77ce9037.zip | |
Merge branch 'egil/fix-mseg_dealloc-arguments/OTP-10912' into maint
* egil/fix-mseg_dealloc-arguments/OTP-10912:
erts: Fix refactor error in mseg
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index f5a29fcb95..aa460420d5 100644 --- a/erts/emulator/sys/common/erl_mseg.c +++ b/erts/emulator/sys/common/erl_mseg.c @@ -1028,7 +1028,7 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg, sys_memcpy(((char *) new_seg), ((char *) seg), MIN(new_size, old_size)); - mseg_dealloc(ma, atype, seg, old_size, opt); + mseg_dealloc(ma, atype, seg, old_size, flags, opt); } #endif } |