From cd482d648cc1f6eaf4f87461de2292f01a8c9920 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 5 Feb 2025 19:12:22 -0500 Subject: [PATCH] kernel: Fix USE_GUARDED_HEAP_FOR_OBJECT_CACHE after object_cache refactors. And allow it to be enabled even if the guarded heap itself technically is not. --- src/system/kernel/guarded_heap.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/system/kernel/guarded_heap.cpp b/src/system/kernel/guarded_heap.cpp index ae8c890a17..360a257756 100644 --- a/src/system/kernel/guarded_heap.cpp +++ b/src/system/kernel/guarded_heap.cpp @@ -998,6 +998,9 @@ realloc(void* address, size_t newSize) } +#endif // USE_GUARDED_HEAP_FOR_MALLOC + + #if USE_GUARDED_HEAP_FOR_OBJECT_CACHE @@ -1011,8 +1014,7 @@ request_memory_manager_maintenance() object_cache* -create_object_cache(const char*, size_t objectSize, size_t, void*, - object_cache_constructor, object_cache_destructor) +create_object_cache(const char*, size_t objectSize, uint32) { return (object_cache*)objectSize; } @@ -1093,6 +1095,3 @@ slab_init_post_thread() #endif // USE_GUARDED_HEAP_FOR_OBJECT_CACHE - - -#endif // USE_GUARDED_HEAP_FOR_MALLOC