git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chore: fix almost *ALL* warnings.
[lunaix-os.git]
/
lunaix-os
/
kernel
/
mm
/
cake.c
diff --git
a/lunaix-os/kernel/mm/cake.c
b/lunaix-os/kernel/mm/cake.c
index 5e03d347706c8943b08c9f2792aecb9d7765aad7..64343031c9a25478857e96f63f6c83b9dd6168e7 100644
(file)
--- a/
lunaix-os/kernel/mm/cake.c
+++ b/
lunaix-os/kernel/mm/cake.c
@@
-28,7
+28,7
@@
struct llist_header piles = { .next = &piles, .prev = &piles };
void*
__alloc_cake(unsigned int cake_pg)
{
void*
__alloc_cake(unsigned int cake_pg)
{
-
uintptr_t pa =
pmm_alloc_cpage(KERNEL_PID, cake_pg, 0);
+
ptr_t pa = (ptr_t)
pmm_alloc_cpage(KERNEL_PID, cake_pg, 0);
if (!pa) {
return NULL;
}
if (!pa) {
return NULL;
}
@@
-44,9
+44,11
@@
__new_cake(struct cake_pile* pile)
return NULL;
}
return NULL;
}
-
in
t max_piece = pile->pieces_per_cake;
+
u32_
t max_piece = pile->pieces_per_cake;
- cake->first_piece = (void*)((uintptr_t)cake + pile->offset);
+ assert(max_piece);
+
+ cake->first_piece = (void*)((ptr_t)cake + pile->offset);
cake->next_free = 0;
pile->cakes_count++;
cake->next_free = 0;
pile->cakes_count++;
@@
-154,7
+156,7
@@
cake_grab(struct cake_pile* pile)
}
void* ptr =
}
void* ptr =
- (void*)((
uint
ptr_t)pos->first_piece + found_index * pile->piece_size);
+ (void*)((ptr_t)pos->first_piece + found_index * pile->piece_size);
if (pile->ctor) {
pile->ctor(pile, ptr);
if (pile->ctor) {
pile->ctor(pile, ptr);
@@
-176,8
+178,7
@@
cake_release(struct cake_pile* pile, void* area)
if (pos->first_piece > area) {
continue;
}
if (pos->first_piece > area) {
continue;
}
- piece_index =
- (uintptr_t)(area - pos->first_piece) / pile->piece_size;
+ piece_index = (ptr_t)(area - pos->first_piece) / pile->piece_size;
if (piece_index < pile->pieces_per_cake) {
goto found;
}
if (piece_index < pile->pieces_per_cake) {
goto found;
}