X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/f6ab9c9ababa2cf6e5c723b83ffb9362094054e8..1375eb51603466b723ab7dd1ca4194ee5d662f75:/lunaix-os/kernel/mm/valloc.c diff --git a/lunaix-os/kernel/mm/valloc.c b/lunaix-os/kernel/mm/valloc.c index 58e57b9..6d67834 100644 --- a/lunaix-os/kernel/mm/valloc.c +++ b/lunaix-os/kernel/mm/valloc.c @@ -5,16 +5,24 @@ #define CLASS_LEN(class) (sizeof(class) / sizeof(class[0])) -static char piles_names[][PILE_NAME_MAXLEN] = { - "valloc_8", "valloc_16", "valloc_32", "valloc_64", - "valloc_128", "valloc_256", "valloc_512", "valloc_1k", - "valloc_2k", "valloc_4k", "valloc_8k" -}; - -static char piles_names_dma[][PILE_NAME_MAXLEN] = { - "valloc_dma_128", "valloc_dma_256", "valloc_dma_512", - "valloc_dma_1k", "valloc_dma_2k", "valloc_dma_4k" -}; +static char piles_names[][PILE_NAME_MAXLEN] = {"valloc_8", + "valloc_16", + "valloc_32", + "valloc_64", + "valloc_128", + "valloc_256", + "valloc_512", + "valloc_1k", + "valloc_2k", + "valloc_4k", + "valloc_8k"}; + +static char piles_names_dma[][PILE_NAME_MAXLEN] = {"valloc_dma_128", + "valloc_dma_256", + "valloc_dma_512", + "valloc_dma_1k", + "valloc_dma_2k", + "valloc_dma_4k"}; static struct cake_pile* piles[CLASS_LEN(piles_names)]; static struct cake_pile* piles_dma[CLASS_LEN(piles_names_dma)]; @@ -31,7 +39,7 @@ valloc_init() for (size_t i = 0; i < CLASS_LEN(piles_names_dma); i++) { int size = 1 << (i + 7); piles_dma[i] = cake_new_pile( - piles_names_dma[i], size, size > 1024 ? 4 : 1, PILE_ALIGN_CACHE); + piles_names_dma[i], size, size > 1024 ? 4 : 1, PILE_ALIGN_CACHE); } } @@ -80,7 +88,7 @@ void* vcalloc(unsigned int size, unsigned int count) { unsigned int alloc_size; - if (__builtin_umul_overflow(size, count, &alloc_size)) { + if (umul_overflow(size, count, &alloc_size)) { return 0; }