summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.c2
-rw-r--r--usertests.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/main.c b/main.c
index ce29af3..c6051ed 100644
--- a/main.c
+++ b/main.c
@@ -28,6 +28,8 @@ main()
acquire_spinlock(&kernel_lock);
idtinit(); // CPU's idt
lapic_init(cpu());
+ lapic_timerinit();
+ lapic_enableintr();
scheduler();
}
acpu = 1;
diff --git a/usertests.c b/usertests.c
index 2f688ca..fa1b210 100644
--- a/usertests.c
+++ b/usertests.c
@@ -93,8 +93,8 @@ preempt()
main()
{
puts("usertests starting\n");
- pipe1();
- //preempt();
+ //pipe1();
+ preempt();
while(1)
;