diff options
Diffstat (limited to 'src/kernel/memory')
-rw-r--r-- | src/kernel/memory/alloc.c | 6 | ||||
-rw-r--r-- | src/kernel/memory/alloc.h | 4 | ||||
-rw-r--r-- | src/kernel/memory/paging.c | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/kernel/memory/alloc.c b/src/kernel/memory/alloc.c index da03d8c..bd4ecb3 100644 --- a/src/kernel/memory/alloc.c +++ b/src/kernel/memory/alloc.c @@ -1,9 +1,9 @@ +#include <lib/lib.h> +#include <memory/alloc.h> +#include <memory/paging.h> #include <stddef.h> #include <stdint.h> -#include <memory/paging.h> -#include <memory/alloc.h> #include <system.h> -#include <lib/lib.h> extern u32 end; u32 placement_address; diff --git a/src/kernel/memory/alloc.h b/src/kernel/memory/alloc.h index 5e51195..952b61c 100644 --- a/src/kernel/memory/alloc.h +++ b/src/kernel/memory/alloc.h @@ -1,9 +1,9 @@ #ifndef MELVIX_ALLOC_H #define MELVIX_ALLOC_H -#include <stdint.h> -#include <stddef.h> #include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define KHEAP_MAGIC 0x04206969 #define KHEAP_MAGIC2 0xDEADBEEF diff --git a/src/kernel/memory/paging.c b/src/kernel/memory/paging.c index 7a98563..d538fe9 100644 --- a/src/kernel/memory/paging.c +++ b/src/kernel/memory/paging.c @@ -1,12 +1,12 @@ -#include <stdint.h> -#include <memory/paging.h> +#include <acpi/acpi.h> +#include <interrupts/interrupts.h> +#include <io/io.h> +#include <lib/lib.h> #include <memory/alloc.h> +#include <memory/paging.h> +#include <stdint.h> #include <system.h> -#include <lib/lib.h> -#include <io/io.h> -#include <acpi/acpi.h> #include <tasks/process.h> -#include <interrupts/interrupts.h> struct page_directory *paging_current_directory = NULL; struct page_directory *paging_root_directory = NULL; |