diff options
author | Björn-Egil Dahlberg <[email protected]> | 2013-03-07 12:30:51 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2013-03-07 12:30:51 +0100 |
commit | 9b1226cb1c5442fae38c0cddb70b6e6b58bed754 (patch) | |
tree | ae008a7f71dc964df40704f9fef5a4b4cebc3492 /erts | |
parent | cf3abdefe2d6dd2389be4e0530b870938d92fc0e (diff) | |
parent | a8c7417e2e1b6e20c1f1a7247a04579b77ce9037 (diff) | |
download | otp-9b1226cb1c5442fae38c0cddb70b6e6b58bed754.tar.gz otp-9b1226cb1c5442fae38c0cddb70b6e6b58bed754.tar.bz2 otp-9b1226cb1c5442fae38c0cddb70b6e6b58bed754.zip |
Merge branch 'maint'
Diffstat (limited to 'erts')
-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 } |