diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-07-06 14:12:03 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-07-06 14:12:03 -0400 |
| commit | 671537364ae09dc65d4bb1c646aa80e9c8f808df (patch) | |
| tree | 86d951407775084fab25601b0d1a3912b800eb0e /rts/posix/OSMem.c | |
| parent | 8736715857d08cc1f88d766c257b39c05df20639 (diff) | |
| download | haskell-671537364ae09dc65d4bb1c646aa80e9c8f808df.tar.gz | |
Revert "rts: Enable two-step allocator on FreeBSD"
This reverts commit 8736715857d08cc1f88d766c257b39c05df20639.
I hadn't intended on merging this.
Diffstat (limited to 'rts/posix/OSMem.c')
| -rw-r--r-- | rts/posix/OSMem.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c index 08f96350c9..e63e798be9 100644 --- a/rts/posix/OSMem.c +++ b/rts/posix/OSMem.c @@ -102,10 +102,8 @@ void osMemInit(void) The naming is chosen from the Win32 API (VirtualAlloc) which does the same thing and has done so forever, while support for this in Unix systems has only been added recently and is hidden in the posix portability mess. - The Linux manpage suggests that mmap must be passed MAP_NORESERVE in order - to get reservation-only behavior. It is confusing because to get the reserve - behavior we need MAP_NORESERVE (which tells the kernel not to allocate backing - space), but heh... + It is confusing because to get the reserve behavior we need MAP_NORESERVE + (which tells the kernel not to allocate backing space), but heh... */ enum { @@ -163,10 +161,7 @@ my_mmap (void *addr, W_ size, int operation) else prot = PROT_NONE; if (operation == MEM_RESERVE) -# if defined(MAP_GUARD) - // Provided by FreeBSD - flags = MAP_GUARD; -# elif defined(MAP_NORESERVE) +# if defined(MAP_NORESERVE) flags = MAP_NORESERVE; # else # if defined(USE_LARGE_ADDRESS_SPACE) |