summaryrefslogtreecommitdiff
path: root/src/memory
diff options
context:
space:
mode:
Diffstat (limited to 'src/memory')
-rw-r--r--src/memory/memory.c8
-rw-r--r--src/memory/virtalloc.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/memory/memory.c b/src/memory/memory.c
index bccc5c3..93c48fc 100644
--- a/src/memory/memory.c
+++ b/src/memory/memory.c
@@ -8,9 +8,9 @@
struct page_header {
struct page_header *next;
struct page_header *prev;
- size_t node_number; // all headers on the same page alloc have the same node number (so they can be merged)
- size_t free; // free space after the node (if its the last node in the alloc block)
- size_t used; // how much space this allocation is using
+ size_t node_number; // all headers on the same page alloc have the same node number (so they can be merged)
+ size_t free; // free space after the node (if its the last node in the alloc block)
+ size_t used; // how much space this allocation is using
uint64_t magic;
};
@@ -52,7 +52,7 @@ void *kalloc_new(size_t size) {
}
struct page_header *header = addr;
- header->magic = 0xBEEFCAFE;
+ header->magic = 0xBEEFCAFE;
header->used = size;
header->free = free;
header->prev = end_header;
diff --git a/src/memory/virtalloc.c b/src/memory/virtalloc.c
index a1d7294..b5cc126 100644
--- a/src/memory/virtalloc.c
+++ b/src/memory/virtalloc.c
@@ -113,7 +113,7 @@ void virtaddr_init(void) {
}
static void merge_back(struct addr_node *node) {
- while(node->prev) {
+ while (node->prev) {
if (node->is_alloc != node->prev->is_alloc)
break;
struct addr_node *temp = node->prev;
@@ -129,7 +129,7 @@ static void merge_back(struct addr_node *node) {
}
static void merge_forward(struct addr_node *node) {
- while(node->next) {
+ while (node->next) {
if (node->is_alloc != node->next->is_alloc)
break;
struct addr_node *temp = node->next;