diff options
| author | Sverker Eriksson <[email protected]> | 2012-11-16 15:00:51 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-11-16 15:00:51 +0100 |
| commit | 048841ed243974562ead2f8d65435e2ffaf974c6 (patch) | |
| tree | a172b2497b981cd45c66b1f4de53ff309d114b6d /erts/emulator | |
| parent | 8f1bd655d8bbfc80efb082daca495c19aff02f3d (diff) | |
| download | otp-048841ed243974562ead2f8d65435e2ffaf974c6.tar.gz otp-048841ed243974562ead2f8d65435e2ffaf974c6.tar.bz2 otp-048841ed243974562ead2f8d65435e2ffaf974c6.zip | |
erts: Fix compile warnings in alloc_util
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index cef30d95a2..1bdd5d79b5 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -2119,7 +2119,9 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags) goto sbc_final_touch; } else { +#ifndef ARCH_64 ASSERT(crr_sz <= MBC_SZ_MAX_LIMIT); +#endif SET_CARRIER_HDR(crr, crr_sz, SCH_MSEG|SCH_MBC, allctr); STAT_MSEG_MBC_ALLOC(allctr, crr_sz); goto mbc_final_touch; @@ -4162,9 +4164,11 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init) allctr->ramv = init->ramv; allctr->main_carrier_size = init->mmbcs; allctr->sbc_threshold = init->sbct; +#ifndef ARCH_64 if (allctr->sbc_threshold > MBC_ABLK_SZ_MASK - ABLK_HDR_SZ) { allctr->sbc_threshold = MBC_ABLK_SZ_MASK - ABLK_HDR_SZ + 1; } +#endif #if HAVE_ERTS_MSEG allctr->mseg_opt.abs_shrink_th = init->asbcst; @@ -4182,10 +4186,11 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init) #endif allctr->largest_mbc_size = MAX(init->lmbcs, init->smbcs); +#ifndef ARCH_64 if (allctr->largest_mbc_size > MBC_SZ_MAX_LIMIT) { allctr->largest_mbc_size = MBC_SZ_MAX_LIMIT; } - +#endif allctr->smallest_mbc_size = init->smbcs; allctr->mbc_growth_stages = MAX(1, init->mbcgs); |