diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kmain.c | 5 | ||||
| -rw-r--r-- | kernel/timer.s | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/kernel/kmain.c b/kernel/kmain.c index 1828ad2..5b2fe91 100644 --- a/kernel/kmain.c +++ b/kernel/kmain.c @@ -1,13 +1,10 @@ #include <kernel/con.h> #include <kernel/memory.h> +#include <kernel/sched.h> #include <kernel/sys.h> #include <stdint.h> #include <sys/types.h> -extern void userspace_init(void); - -uint32_t ticks = 0; - void kmain(void) { con_init(); diff --git a/kernel/timer.s b/kernel/timer.s index 53c81ed..3723782 100644 --- a/kernel/timer.s +++ b/kernel/timer.s @@ -1,8 +1,8 @@ +global ticks global timer_init extern register_isr -; TODO: move this someplace safe (not kmain.c) -extern ticks +ticks: dd 0 tick_handler: push ax |