diff options
author | Marvin Borner | 2020-05-07 22:19:13 +0200 |
---|---|---|
committer | Marvin Borner | 2020-05-07 22:19:13 +0200 |
commit | 9b2e28ad7a752c0fe7b60e73ca43c827b45b3ee8 (patch) | |
tree | 5b1b48ccf8324cced9ae9c4139b493cd98789cc2 /src/kernel/tasks | |
parent | 43184e40b14a5e41383ffb053e7c69c93ff81036 (diff) |
Added and applied include-sorting
Worked better than I thought!
Diffstat (limited to 'src/kernel/tasks')
-rw-r--r-- | src/kernel/tasks/process.c | 18 | ||||
-rw-r--r-- | src/kernel/tasks/process.h | 4 | ||||
-rw-r--r-- | src/kernel/tasks/userspace.c | 14 | ||||
-rw-r--r-- | src/kernel/tasks/userspace.h | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/kernel/tasks/process.c b/src/kernel/tasks/process.c index 32433d8..431f1fb 100644 --- a/src/kernel/tasks/process.c +++ b/src/kernel/tasks/process.c @@ -1,15 +1,15 @@ -#include <stdint.h> -#include <stddef.h> -#include <tasks/process.h> -#include <tasks/userspace.h> -#include <io/io.h> +#include <fs/elf.h> #include <interrupts/interrupts.h> -#include <system.h> +#include <io/io.h> #include <lib/lib.h> -#include <memory/paging.h> #include <memory/alloc.h> +#include <memory/paging.h> +#include <stddef.h> +#include <stdint.h> +#include <system.h> +#include <tasks/process.h> +#include <tasks/userspace.h> #include <timer/timer.h> -#include <fs/elf.h> u32 pid = 0; struct process *root; @@ -250,4 +250,4 @@ u32 uexec(char *path) proc->gid = current_proc->pid; process_spawn(proc); return 0; -} +}
\ No newline at end of file diff --git a/src/kernel/tasks/process.h b/src/kernel/tasks/process.h index 9aae9bc..17467c4 100644 --- a/src/kernel/tasks/process.h +++ b/src/kernel/tasks/process.h @@ -1,9 +1,9 @@ #ifndef MELVIX_PROCESS_H #define MELVIX_PROCESS_H -#include <stdint.h> -#include <memory/paging.h> #include <interrupts/interrupts.h> +#include <memory/paging.h> +#include <stdint.h> struct mmap { u32 text; diff --git a/src/kernel/tasks/userspace.c b/src/kernel/tasks/userspace.c index 77392a1..375e7bb 100644 --- a/src/kernel/tasks/userspace.c +++ b/src/kernel/tasks/userspace.c @@ -1,12 +1,12 @@ -#include <stdint.h> +#include <interrupts/interrupts.h> +#include <io/io.h> +#include <lib/lib.h> +#include <memory/paging.h> #include <stddef.h> +#include <stdint.h> #include <system.h> -#include <tasks/userspace.h> #include <tasks/process.h> -#include <memory/paging.h> -#include <io/io.h> -#include <interrupts/interrupts.h> -#include <lib/lib.h> +#include <tasks/userspace.h> struct process *proc_bottom = NULL; @@ -63,4 +63,4 @@ u32 single_exit(struct regs *regs) paging_switch_directory(proc_bottom->cr3); return hold; -} +}
\ No newline at end of file diff --git a/src/kernel/tasks/userspace.h b/src/kernel/tasks/userspace.h index 208476a..d66ba54 100644 --- a/src/kernel/tasks/userspace.h +++ b/src/kernel/tasks/userspace.h @@ -1,9 +1,9 @@ #ifndef MELVIX_USERSPACE_H #define MELVIX_USERSPACE_H +#include <interrupts/interrupts.h> #include <stdint.h> #include <tasks/process.h> -#include <interrupts/interrupts.h> u32 spawn_child(struct process *child); |