aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMarvin Borner2021-01-09 14:06:32 +0100
committerMarvin Borner2021-01-09 14:06:32 +0100
commitdcd28d5246eec562c195fba07c7bd4ce7b69c94b (patch)
tree43b425108b5a6822e35a89779465fc19376ca74a /kernel
parentca466dbbecd387481fbde95e1e3d9b6ff279c169 (diff)
Started new heap implementation (not working yet)
Diffstat (limited to 'kernel')
-rw-r--r--kernel/features/proc.c2
-rw-r--r--kernel/main.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index d76312c..c0216bc 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -142,6 +142,8 @@ void proc_exit(struct proc *proc, int status)
printf("Process %s exited with status %d\n", proc->name, status);
quantum = 0; // TODO: Add quantum to each process struct?
+ sti();
+ hlt();
}
void proc_yield(struct regs *r)
diff --git a/kernel/main.c b/kernel/main.c
index 563cae7..665d474 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -11,6 +11,7 @@
#include <mouse.h>
#include <net.h>
#include <pci.h>
+#include <print.h>
#include <serial.h>
#include <syscall.h>
#include <timer.h>