diff options
| author | Sverker Eriksson <[email protected]> | 2018-03-13 19:32:10 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-03-13 19:32:10 +0100 |
| commit | b9872a64b863c424c4d548d4454e6e1b3153ddc4 (patch) | |
| tree | 8df8b0e8ed3443460684f961d8df280a7fc937f1 /erts/emulator/beam/erl_alloc_util.c | |
| parent | 3571f624d94638381a420762b69517a3f255df9f (diff) | |
| parent | a2f9a1e05ef8dd1fb8a280c66434529fec580a25 (diff) | |
| download | otp-b9872a64b863c424c4d548d4454e6e1b3153ddc4.tar.gz otp-b9872a64b863c424c4d548d4454e6e1b3153ddc4.tar.bz2 otp-b9872a64b863c424c4d548d4454e6e1b3153ddc4.zip | |
Merge PR-1699 from sverker/hipe-amd64-high-code/OTP-14951
Remove low memory need for HiPE on x86_64
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index d178c2c2c2..e148be7af6 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -874,7 +874,7 @@ erts_alcu_literal_32_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size, #elif defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION) /* For allocators that have their own mmapper (super carrier), - * like literal_alloc and exec_alloc on amd64 + * like literal_alloc. */ void* erts_alcu_mmapper_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags) @@ -916,10 +916,10 @@ erts_alcu_mmapper_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size, } #endif /* ARCH_64 && ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION */ -#if defined(ERTS_ALC_A_EXEC) && !defined(ERTS_HAVE_EXEC_MMAPPER) +#if defined(ERTS_ALC_A_EXEC) /* - * For exec_alloc on non-amd64 that just need memory with PROT_EXEC + * For exec_alloc that need memory with PROT_EXEC */ void* erts_alcu_exec_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags) @@ -958,7 +958,7 @@ erts_alcu_exec_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size, Uint flags) ASSERT(r == 0); (void)r; erts_alcu_mseg_dealloc(allctr, seg, size, flags); } -#endif /* ERTS_ALC_A_EXEC && !ERTS_HAVE_EXEC_MMAPPER */ +#endif /* ERTS_ALC_A_EXEC */ #endif /* HAVE_ERTS_MSEG */ |