diff options
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/arch/generic.h | 2 | ||||
-rw-r--r-- | src/kernel/arch/i386/registers.h | 2 | ||||
-rw-r--r-- | src/kernel/handle.h | 2 | ||||
-rw-r--r-- | src/kernel/mem/virt.h | 2 | ||||
-rw-r--r-- | src/kernel/syscalls.c | 1 | ||||
-rw-r--r-- | src/kernel/types.h | 12 | ||||
-rw-r--r-- | src/kernel/vfs/root.c | 1 |
7 files changed, 4 insertions, 18 deletions
diff --git a/src/kernel/arch/generic.h b/src/kernel/arch/generic.h index 0696a96..e5ececd 100644 --- a/src/kernel/arch/generic.h +++ b/src/kernel/arch/generic.h @@ -1,8 +1,8 @@ #pragma once -#include <kernel/types.h> #include <kernel/arch/i386/registers.h> #include <kernel/arch/log.h> +#include <shared/types.h> #include <stdbool.h> // i have no idea where else to put it diff --git a/src/kernel/arch/i386/registers.h b/src/kernel/arch/i386/registers.h index 5443b10..8bd090d 100644 --- a/src/kernel/arch/i386/registers.h +++ b/src/kernel/arch/i386/registers.h @@ -1,5 +1,5 @@ #pragma once -#include <kernel/types.h> +#include <shared/types.h> #include <stdint.h> struct registers { diff --git a/src/kernel/handle.h b/src/kernel/handle.h index 4ec8e57..917f738 100644 --- a/src/kernel/handle.h +++ b/src/kernel/handle.h @@ -1,6 +1,6 @@ #pragma once -#include <kernel/types.h> #include <kernel/vfs/mount.h> +#include <shared/types.h> #include <stddef.h> #define HANDLE_MAX 16 diff --git a/src/kernel/mem/virt.h b/src/kernel/mem/virt.h index 54454e9..3a42e9e 100644 --- a/src/kernel/mem/virt.h +++ b/src/kernel/mem/virt.h @@ -1,6 +1,6 @@ /* contains utilities for interacting with virtual memory */ #pragma once -#include <kernel/types.h> +#include <shared/types.h> #include <stdbool.h> #include <stddef.h> diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c index a5c6f43..1bc9694 100644 --- a/src/kernel/syscalls.c +++ b/src/kernel/syscalls.c @@ -3,7 +3,6 @@ #include <kernel/mem/virt.h> #include <kernel/panic.h> #include <kernel/proc.h> -#include <kernel/types.h> #include <kernel/vfs/path.h> #include <shared/flags.h> #include <shared/syscalls.h> diff --git a/src/kernel/types.h b/src/kernel/types.h deleted file mode 100644 index 44a0d46..0000000 --- a/src/kernel/types.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include <stdint.h> - -#define TYPES_INCLUDED - -#ifdef __CHECKER__ -# define __user __attribute__((noderef, address_space(__user))) -#else -# define __user -#endif - -typedef void __user * userptr_t; diff --git a/src/kernel/vfs/root.c b/src/kernel/vfs/root.c index feb718d..6fcfc08 100644 --- a/src/kernel/vfs/root.c +++ b/src/kernel/vfs/root.c @@ -1,7 +1,6 @@ #include <kernel/mem/virt.h> #include <kernel/panic.h> #include <kernel/proc.h> -#include <kernel/types.h> #include <kernel/util.h> #include <kernel/vfs/root.h> |