diff --git a/kernel/amd64/apic.c b/kernel/amd64/apic.c index c25ebc3..8e5a551 100644 --- a/kernel/amd64/apic.c +++ b/kernel/amd64/apic.c @@ -6,8 +6,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/kernel/amd64/proc.c b/kernel/amd64/proc.c index eadbedb..6fcd58f 100644 --- a/kernel/amd64/proc.c +++ b/kernel/amd64/proc.c @@ -1,10 +1,10 @@ +#include #include #include -#include -#include #include +#include #include -#include +#include struct proc* proc_from_elf (uint8_t* elf_contents) { struct proc* proc = malloc (sizeof (*proc)); diff --git a/kernel/proc/proc.c b/kernel/proc/proc.c index a7706b9..96a039e 100644 --- a/kernel/proc/proc.c +++ b/kernel/proc/proc.c @@ -13,13 +13,13 @@ #include #include #include +#include #include #include -#include #include #if defined(__x86_64__) - #include +#include #endif static struct procw* procs; @@ -131,9 +131,9 @@ static void proc_register (struct proc* proc) { spin_unlock (&procs_lock); } -static struct proc *proc_find_sched (void) { - struct proc *start = thiscpu->proc_current; - struct proc *proc = start->next; +static struct proc* proc_find_sched (void) { + struct proc* start = thiscpu->proc_current; + struct proc* proc = start->next; for (;;) { if (proc == NULL) { @@ -154,7 +154,7 @@ static struct proc *proc_find_sched (void) { } void proc_sched (void) { - struct proc *next = NULL; + struct proc* next = NULL; spin_lock (&thiscpu->lock); diff --git a/kernel/proc/proc.h b/kernel/proc/proc.h index f136d68..b10825f 100644 --- a/kernel/proc/proc.h +++ b/kernel/proc/proc.h @@ -13,10 +13,9 @@ #endif /// Process is ready to run -#define PROC_READY 0 +#define PROC_READY 0 /// Process marked garbage collection -#define PROC_DEAD 1 - +#define PROC_DEAD 1 struct cpu; diff --git a/kernel/sys/spin.h b/kernel/sys/spin.h index 8447091..41e91ea 100644 --- a/kernel/sys/spin.h +++ b/kernel/sys/spin.h @@ -2,8 +2,8 @@ #define _KERNEL_SYS_SPIN_H #if defined(__x86_64__) - extern void amd64_spin (void); - #define spin amd64_spin +extern void amd64_spin (void); +#define spin amd64_spin #endif #endif // _KERNEL_SYS_SPIN_H