From 3e063ba1f5b518d6042e16b3779be8dcd769c199 Mon Sep 17 00:00:00 2001
From: Zheng Da <zhengda1936@gmail.com>
Date: Tue, 15 Jun 2010 18:28:34 +0200
Subject: Revert "Use malloc/free by default in slab."

This reverts commit 198a98db43a1cce35242ea5cc12e1d9c5c57db40.
---
 libhurd-slab/slab.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libhurd-slab/slab.c b/libhurd-slab/slab.c
index 58222704..b20a8e74 100644
--- a/libhurd-slab/slab.c
+++ b/libhurd-slab/slab.c
@@ -24,6 +24,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <sys/mman.h>
 #include <assert.h>
 #include <string.h>
 #include <unistd.h>
@@ -76,8 +77,9 @@ allocate_buffer (struct hurd_slab_space *space, size_t size, void **ptr)
     return space->allocate_buffer (space->hook, size, ptr);
   else
     {
-      *ptr = malloc (size);
-      if (*ptr == NULL)
+      *ptr = mmap (NULL, size, PROT_READ|PROT_WRITE,
+		   MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
+      if (*ptr == MAP_FAILED)
 	return errno;
       else
 	return 0;
@@ -93,8 +95,10 @@ deallocate_buffer (struct hurd_slab_space *space, void *buffer, size_t size)
     return space->deallocate_buffer (space->hook, buffer, size);
   else
     {
-      free (buffer);
-      return 0;
+      if (munmap (buffer, size) == -1)
+	return errno;
+      else
+	return 0;
     }
 }
 
-- 
cgit v1.2.3