Merge branch 'BetterTerm' into BetterPaging

2019-05-15 16:42:26 +02:00 · 2019-05-15 16:42:26 +02:00 · bee9793a8b
parent 9152ac341f 602b436113
commit bee9793a8b
1 changed files with 4 additions and 0 deletions
--- a/kaleid/libc/mem.c
+++ b/kaleid/libc/mem.c
@ -36,7 +36,11 @@ void *malloc(size_t n)
    void *ptr;
    error_t rc;

+#ifndef _KALEID_KERNEL
    rc = KalAllocMemory(&ptr, n);
+#else
+    rc = KalAllocMemoryEx(&ptr, n, M_ZEROED, 0);
+#endif
    if (rc > 0) seterrno(rc);

    return ptr;