aboutsummaryrefslogtreecommitdiff
path: root/kernel/include/slab_alloc.h
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2014-12-06 18:39:12 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2014-12-06 18:39:12 +0100
commitff27e3d5ca61fb6234b0876dc3368d0e5dfc5a95 (patch)
treee7945b5cae3925ae50082da7b80e9b3caf914fa4 /kernel/include/slab_alloc.h
parent274765f7daa3cc1094f9f26196fcf2b9a5289ee2 (diff)
downloadmacroscope-ff27e3d5ca61fb6234b0876dc3368d0e5dfc5a95.tar.gz
macroscope-ff27e3d5ca61fb6234b0876dc3368d0e5dfc5a95.zip
Trying to track an annoying bug.
Diffstat (limited to 'kernel/include/slab_alloc.h')
-rw-r--r--kernel/include/slab_alloc.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/include/slab_alloc.h b/kernel/include/slab_alloc.h
index 5c575ba..5355a66 100644
--- a/kernel/include/slab_alloc.h
+++ b/kernel/include/slab_alloc.h
@@ -8,7 +8,14 @@
#include <stddef.h>
#include <stdbool.h>
-#include <sys.h>
+#if defined(__linux__)
+//redefine necessary stuff
+#include <assert.h>
+#define ASSERT assert
+#define PAGE_SIZE 0x1000
+#else
+#include <sys.h> // this is macroscope
+#endif
// expected format for the array of slab_type_t given to slab_create :
// an array of slab_type descriptors, with last descriptor full of zeroes