fmt

6 files changed, 15 insertions, 14 deletions

diff --git a/kernel/include/comus/cpu.h b/kernel/include/comus/cpu.h
index 8f485be..3669000 100644
--- a/kernel/include/comus/cpu.h
+++ b/kernel/include/comus/cpu.h
@@ -92,7 +92,6 @@ void cpu_print_regs(struct cpu_regs *regs);
 /**
  * Return from a syscall handler back into userspace
  */
-__attribute__((noreturn))
-void syscall_return(void);
+__attribute__((noreturn)) void syscall_return(void);
 
 #endif /* cpu.h */
diff --git a/kernel/include/comus/procs.h b/kernel/include/comus/procs.h
index de65849..0150975 100644
--- a/kernel/include/comus/procs.h
+++ b/kernel/include/comus/procs.h
@@ -222,7 +222,6 @@ void schedule(struct pcb *pcb);
 /**
  * Select the next process to receive the CPU
  */
-__attribute__((noreturn))
-void dispatch(void);
+__attribute__((noreturn)) void dispatch(void);
 
 #endif /* procs.h */
diff --git a/kernel/memory/paging.c b/kernel/memory/paging.c
index c6e6a82..3453636 100644
--- a/kernel/memory/paging.c
+++ b/kernel/memory/paging.c
@@ -704,8 +704,8 @@ volatile void *pgdir_alloc(void)
 volatile void *pgdir_clone(volatile const void *old_pgdir, bool cow)
 {
 	// TODO:
-	(void) old_pgdir;
-	(void) cow;
+	(void)old_pgdir;
+	(void)cow;
 	return NULL;
 }
 
@@ -827,7 +827,7 @@ void *mem_alloc_pages_at(mem_ctx_t ctx, size_t count, void *virt,
 		if (map_pages((volatile struct pml4 *)ctx->pml4,
 					  (void *)virtual_address, phys_pages.pagestart, flags,
 					  phys_pages.num_pages)) {
-            assert(phys_start, "expected something allocated");
+			assert(phys_start, "expected something allocated");
 			free_phys_pages(phys_start, count - pages_needed);
 			return NULL;
 		}
diff --git a/kernel/memory/physalloc.c b/kernel/memory/physalloc.c
index 833c995..9fcbe8f 100644
--- a/kernel/memory/physalloc.c
+++ b/kernel/memory/physalloc.c
@@ -87,7 +87,7 @@ void *alloc_phys_pages_exact(size_t pages)
 
 	if (bitmap == NULL || page_start == NULL) {
 		// temporary bump allocator
-		void *addr = (void*)memory_start;
+		void *addr = (void *)memory_start;
 		memory_start += PAGE_SIZE;
 		return addr;
 	}
diff --git a/kernel/memory/virtalloc.c b/kernel/memory/virtalloc.c
index 08a0758..cbde9b4 100644
--- a/kernel/memory/virtalloc.c
+++ b/kernel/memory/virtalloc.c
@@ -102,12 +102,14 @@ int virtaddr_clone(struct virt_ctx *old, struct virt_ctx *new)
 	memcpy(new, old, sizeof(struct virt_ctx));
 
 	// allocate new space
-	new->alloc_nodes = kalloc(sizeof(struct virt_addr_node) * new->alloc_node_count);
+	new->alloc_nodes =
+		kalloc(sizeof(struct virt_addr_node) * new->alloc_node_count);
 	if (new->alloc_nodes == NULL)
 		return 1;
 
 	// update prev/next in new allocation space
-	update_node_ptrs(old->alloc_nodes, new->alloc_nodes, old->alloc_node_count, new->alloc_node_count);
+	update_node_ptrs(old->alloc_nodes, new->alloc_nodes, old->alloc_node_count,
+					 new->alloc_node_count);
 
 	// update bootstrap nodes
 	for (size_t i = 0; i < new->used_node_count; i++) {
@@ -117,8 +119,10 @@ int virtaddr_clone(struct virt_ctx *old, struct virt_ctx *new)
 			break;
 
 		// get prev
-		prev = i > 0 ? &new->bootstrap_nodes[i-1] : NULL;
-		next = i < BOOTSTRAP_VIRT_ALLOC_NODES - 1 ? &new->bootstrap_nodes[i+1] : NULL;
+		prev = i > 0 ? &new->bootstrap_nodes[i - 1] : NULL;
+		next = i < BOOTSTRAP_VIRT_ALLOC_NODES - 1 ?
+				   &new->bootstrap_nodes[i + 1] :
+				   NULL;
 
 		new->bootstrap_nodes[i].prev = prev;
 		new->bootstrap_nodes[i].next = next;
diff --git a/kernel/procs.c b/kernel/procs.c
index f114f52..340739d 100644
--- a/kernel/procs.c
+++ b/kernel/procs.c
@@ -461,8 +461,7 @@ void schedule(struct pcb *pcb)
 		panic("schedule insert fail");
 }
 
-__attribute__((noreturn))
-void dispatch(void)
+__attribute__((noreturn)) void dispatch(void)
 {
 	assert(current_pcb == NULL, "dispatch: current process is not null");