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.
This commit is contained in:
@@ -998,6 +998,9 @@ realloc(void* address, size_t newSize)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif // USE_GUARDED_HEAP_FOR_MALLOC
|
||||||
|
|
||||||
|
|
||||||
#if USE_GUARDED_HEAP_FOR_OBJECT_CACHE
|
#if USE_GUARDED_HEAP_FOR_OBJECT_CACHE
|
||||||
|
|
||||||
|
|
||||||
@@ -1011,8 +1014,7 @@ request_memory_manager_maintenance()
|
|||||||
|
|
||||||
|
|
||||||
object_cache*
|
object_cache*
|
||||||
create_object_cache(const char*, size_t objectSize, size_t, void*,
|
create_object_cache(const char*, size_t objectSize, uint32)
|
||||||
object_cache_constructor, object_cache_destructor)
|
|
||||||
{
|
{
|
||||||
return (object_cache*)objectSize;
|
return (object_cache*)objectSize;
|
||||||
}
|
}
|
||||||
@@ -1093,6 +1095,3 @@ slab_init_post_thread()
|
|||||||
|
|
||||||
|
|
||||||
#endif // USE_GUARDED_HEAP_FOR_OBJECT_CACHE
|
#endif // USE_GUARDED_HEAP_FOR_OBJECT_CACHE
|
||||||
|
|
||||||
|
|
||||||
#endif // USE_GUARDED_HEAP_FOR_MALLOC
|
|
||||||
|
|||||||
Reference in New Issue
Block a user