summaryrefslogtreecommitdiff
path: root/kernel/kmain.c
diff options
context:
space:
mode:
authorJake Mannens <jake72360@gmail.com>2018-07-08 01:55:48 +1000
committerJake Mannens <jake72360@gmail.com>2018-07-08 01:55:48 +1000
commitb99a1b58d63dfefb319eecb564c07a4029e02233 (patch)
treec0557d3c775928d106a5c26c765b0063be96b936 /kernel/kmain.c
parent70b141b3af85771f36119165e072c1c45d64de84 (diff)
Moved the 'ticks' variable from kmain.c to timer.s.
Added the prototype for userspace_init() to sched.h removing the need to the extern declaration in kmain.c.
Diffstat (limited to 'kernel/kmain.c')
-rw-r--r--kernel/kmain.c5
1 files changed, 1 insertions, 4 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();