Revert "Multipage allocation"

This reverts commit 6cd37713781a3092f8166b2178fae35cbfec1e28.

2 files changed, 3 insertions, 1 deletions

diff --git a/lib/resource.c b/lib/resource.c
index e80b315b..0ad886d9 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -61,6 +61,7 @@ pool root_pool;
 
 void *alloc_sys_page(void);
 void free_sys_page(void *);
+void resource_sys_init(void);
 
 static int indent;
 
@@ -282,6 +283,7 @@ rlookup(unsigned long a)
 void
 resource_init(void)
 {
+  resource_sys_init();
   root_pool.r.class = &pool_class;
   root_pool.name = "Root";
   init_list(&root_pool.inside);
diff --git a/lib/slab.c b/lib/slab.c
index 6348e29b..2fc88ee0 100644
--- a/lib/slab.c
+++ b/lib/slab.c
@@ -178,7 +178,7 @@ struct sl_alignment {			/* Magic structure for testing of alignment */
   int x[0];
 };
 
-#define SL_GET_HEAD(x)	((struct sl_head *) PAGE_HEAD(x))
+#define SL_GET_HEAD(x)	((struct sl_head *) (((uintptr_t) (x)) & ~(page_size-1)))
 
 /**
  * sl_new - create a new Slab