summaryrefslogtreecommitdiffstats
path: root/monitor_mm.c
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2002-07-14 13:36:49 -0700
committerTim Rice <tim@multitalents.net>2002-07-14 13:36:49 -0700
commit40017b0e7aa236ca1144563dea986a95684f1599 (patch)
treeaa62ff2bf0033c2c833724036d732f7ecdd287a8 /monitor_mm.c
parent952101952f204e5a85698a01469612d6518fc99a (diff)
(bal/tim) [acconfig.h configure.ac monitor_mm.c servconf.c
openbsd-compat/Makefile.in] support compression on platforms that have no/broken MAP_ANON. Moved code to openbsd-compat/xmmap.c Based on patch from nalin@redhat.com of code extracted from Owl's package
Diffstat (limited to 'monitor_mm.c')
-rw-r--r--monitor_mm.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/monitor_mm.c b/monitor_mm.c
index f72a180e..fb5f2c82 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -91,15 +91,9 @@ mm_create(struct mm_master *mmalloc, size_t size)
*/
mm->mmalloc = mmalloc;
-#ifdef HAVE_MMAP_ANON_SHARED
- address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
- -1, 0);
+ address = xmmap(size);
if (address == MAP_FAILED)
fatal("mmap(%lu): %s", (u_long)size, strerror(errno));
-#else
- fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported",
- __func__);
-#endif
mm->address = address;
mm->size = size;
@@ -137,7 +131,7 @@ mm_destroy(struct mm_master *mm)
mm_freelist(mm->mmalloc, &mm->rb_free);
mm_freelist(mm->mmalloc, &mm->rb_allocated);
-#ifdef HAVE_MMAP_ANON_SHARED
+#ifdef HAVE_MMAP
if (munmap(mm->address, mm->size) == -1)
fatal("munmap(%p, %lu): %s", mm->address, (u_long)mm->size,
strerror(errno));