diff options
| author | Sverker Eriksson <[email protected]> | 2015-09-07 19:58:47 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-09-11 16:41:02 +0200 |
| commit | 1fd4809777931a4dc166fd9f1b552317a385cd62 (patch) | |
| tree | caadc657ce16f7b3070b3392eaef74313ceb8f81 /erts/emulator | |
| parent | 34e1b675f95d0837823b794f3440300806f7ef88 (diff) | |
| download | otp-1fd4809777931a4dc166fd9f1b552317a385cd62.tar.gz otp-1fd4809777931a4dc166fd9f1b552317a385cd62.tar.bz2 otp-1fd4809777931a4dc166fd9f1b552317a385cd62.zip | |
erts: Fix strangeness in treatment of MSEG_ALIGN_BITS
And remove old case of using only page alignment (12 bits).
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.h | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index 792f8c63ac..f314eab4c2 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -220,7 +220,7 @@ erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t); #if ERTS_HAVE_MSEG_SUPER_ALIGNED \ || (!HAVE_ERTS_MSEG && ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC) -# ifndef MSEG_ALIGN_BITS +# ifdef MSEG_ALIGN_BITS # define ERTS_SUPER_ALIGN_BITS MSEG_ALIGN_BITS # else # define ERTS_SUPER_ALIGN_BITS 18 diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h index 656484702d..677f8ea4ed 100644 --- a/erts/emulator/sys/common/erl_mseg.h +++ b/erts/emulator/sys/common/erl_mseg.h @@ -42,16 +42,6 @@ #if ERTS_HAVE_MSEG_SUPER_ALIGNED # define MSEG_ALIGN_BITS ERTS_MMAP_SUPERALIGNED_BITS -#else -/* If we don't use super aligned multiblock carriers - * we will mmap with page size alignment (and thus use corresponding - * align bits). - * - * Current implementation needs this to be a constant and - * only uses this for user dev testing so setting page size - * to 4096 (12 bits) is fine. - */ -# define MSEG_ALIGN_BITS (12) #endif #if HAVE_ERTS_MSEG |