From f58b65c61225e9107717573fc5d53882ad1fa349 Mon Sep 17 00:00:00 2001 From: Matheus Date: Fri, 29 Jul 2022 14:51:07 -0300 Subject: [PATCH] comment --- src/sys/mm/slab.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/sys/mm/slab.c b/src/sys/mm/slab.c index 1ddda50e..eff0b14f 100644 --- a/src/sys/mm/slab.c +++ b/src/sys/mm/slab.c @@ -9,6 +9,11 @@ #define SLAB_SIZE PAGE_SIZE // TODO have the slabs be in virtual memory rather than in the hhdm +<<<<<<< HEAD +======= +// this isn't great but enough for an initial implementation +// redo this later +>>>>>>> 3e78844 (Initial slab implementation) // the layout of a slab in this implementation: // header (slab_t)