Index: generic/include/mm/frame.h
===================================================================
--- generic/include/mm/frame.h	(revision ef67bab91625cc0f0eaecd741316d269bbfd5094)
+++ generic/include/mm/frame.h	(revision 758e0656a7ae1a5fb7f2816ba0245ee9cf2ec832)
@@ -36,4 +36,5 @@
 #include <synch/spinlock.h>
 #include <mm/buddy.h>
+#include <mm/slab.h>
 
 #define ONE_FRAME	0
@@ -41,5 +42,5 @@
 #define FRAME_KA		1	/* skip frames conflicting with user address space */
 #define FRAME_PANIC		2	/* panic on failure */
-#define FRAME_NON_BLOCKING	4	/* do not panic and do not sleep on failure */
+#define FRAME_ATOMIC 	        4	/* do not panic and do not sleep on failure */
 
 #define FRAME_OK		0	/* frame_alloc return status */
@@ -78,4 +79,5 @@
 	__u8 buddy_order;	/**< buddy system block order */
 	link_t buddy_link;	/**< link to the next free block inside one order */
+	slab_slab_t *slab;      /**< If allocated by slab, this points there */
 };
 
Index: generic/include/mm/slab.h
===================================================================
--- generic/include/mm/slab.h	(revision 758e0656a7ae1a5fb7f2816ba0245ee9cf2ec832)
+++ generic/include/mm/slab.h	(revision 758e0656a7ae1a5fb7f2816ba0245ee9cf2ec832)
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2005 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __SLAB_H__
+#define __SLAB_H__
+
+#include <list.h>
+#include <synch/spinlock.h>
+
+/** Initial Magazine size (TODO: dynamically growing magazines) */
+#define SLAB_MAG_SIZE  4
+
+/** If object size is less, store control structure inside SLAB */
+#define SLAB_INSIDE_SIZE   (PAGE_SIZE / 6)
+
+/* slab_alloc constants */
+#define SLAB_ATOMIC       0x1 /**< Do not sleep when no free memory, 
+				   may return NULL */
+#define SLAB_NO_RECLAIM   0x2 /**< Do not try to call slab_reclaim, if no
+				 free memory is found - avoid deadlock */
+
+/* slab_reclaim constants */
+#define SLAB_RECLAIM_ALL  0x1 /**< Reclaim all possible memory, because
+			       *   we are in memory stress */
+
+/* cache_create flags */
+#define SLAB_CACHE_NOMAGAZINE 0x1 /**< Do not use per-cpu cache */
+#define SLAB_CACHE_SLINSIDE   0x2 /**< Have control structure inside SLAB */
+
+typedef struct {
+	link_t link;
+	count_t busy;
+	count_t size;
+	void *objs[0];
+}slab_magazine_t;
+
+typedef struct {
+	char *name;
+
+	SPINLOCK_DECLARE(lock);
+	link_t link;
+	/* Configuration */
+	size_t size;
+	size_t align;
+	int (*constructor)(void *obj, int kmflag);
+	void (*destructor)(void *obj);
+	int flags;
+
+	/* Computed values */
+	int pages;
+	int objects;
+
+	/* Statistics */
+
+	/* Slabs */
+	link_t full_slabs;
+	link_t partial_slabs;
+	/* Magazines  */
+	link_t magazines;
+	/* CPU cache */
+	struct {
+		slab_magazine_t *current;
+		slab_magazine_t *last;
+		SPINLOCK_DECLARE(lock);
+	}mag_cache[0];
+}slab_cache_t;
+
+typedef struct {
+	slab_cache_t *cache; /**< Pointer to parent cache */
+	void *start;       /**< Start address of first available item */
+	count_t available; /**< Count of available items in this slab */
+	index_t nextavail; /**< The index of next available item */
+}slab_slab_t;
+
+
+slab_cache_t * slab_cache_create(char *name,
+				 size_t size,
+				 size_t align,
+				 int (*constructor)(void *obj, int kmflag),
+				 void (*destructor)(void *obj),
+				 int flags);
+void slab_cache_destroy(slab_cache_t *cache);
+
+void * slab_alloc(slab_cache_t *cache, int flags);
+void slab_free(slab_cache_t *cache, void *obj);
+count_t slab_reclaim(int flags);
+
+/** Initialize SLAB subsytem */
+void slab_cache_init(void);
+
+/* KConsole debug */
+void slab_print_list(void);
+
+#endif