give each cpu its own clock, so that preemption works on cpu 1

diff --git a/main.c b/main.c
index ce29af3a9e3d38d29d4c2004832982f13fab1e9f..c6051ed913e417c33653d97046f8461e30e89f87 100644 (file)
--- 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 2f688ca98d82e1894f29f8700d01cc973699a40e..fa1b2100a7f4b0ee293b01ec8ba5fbff067a81fd 100644 (file)
--- a/usertests.c
+++ b/usertests.c
@@ -93,8 +93,8 @@ preempt()
 main()
 {
   puts("usertests starting\n");
-  pipe1();
-  //preempt();
+  //pipe1();
+  preempt();
 
   while(1)
     ;