]> Devi Nivas Git - cs3210-lab1.git/commitdiff
cleaner
authorrsc <rsc>
Thu, 27 Sep 2007 21:02:03 +0000 (21:02 +0000)
committerrsc <rsc>
Thu, 27 Sep 2007 21:02:03 +0000 (21:02 +0000)
defs.h
lapic.c

diff --git a/defs.h b/defs.h
index beb48fec63479be5d591e2ccbdb9f2b31e2e3a22..661f7617e047e9ca5d587bbe2e52d2bd9c99505a 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -92,7 +92,7 @@ int             pipewrite(struct pipe*, char*, int);
 
 // proc.c
 struct proc*    copyproc(struct proc*);
-struct proc*    curproc();
+struct proc*    curproc(void);
 void            exit(void);
 int             growproc(int);
 int             kill(int);
diff --git a/lapic.c b/lapic.c
index 3ce58428c1ac76c5fda031828e1db429a598c260..d4429a55db6988cbaefcb1139f87d439119e1b68 100644 (file)
--- a/lapic.c
+++ b/lapic.c
@@ -101,16 +101,8 @@ cpu(void)
   // through acquire and release.
   if(read_eflags()&FL_IF){
     static int n;
-    int i;
-    uint pcs[10];
-
-    if(n++%999 == 0){
-      getcallerpcs((uint*)read_ebp() + 2, pcs);
-      cprintf("cpu called from %x with interrupts enabled: stk");
-      for(i=0; i<10 && pcs[i] && pcs[i] != -1; i++)
-        cprintf(" %x", pcs[i]);
-      cprintf("\n");
-    }
+    if(n++ == 0)
+      cprintf("cpu called from %x with interrupts enabled\n", ((uint*)read_ebp())[1]);
   }
 
   if(lapic)