use panic

2e2d14c2 · Frans Kaashoek · 7c00ce81 · 2e2d14c2 · 2e2d14c2
--- a/console.c
+++ b/console.c
@@ -111,7 +111,8 @@ panic(char *s)
  cli();
  cons.locking = 0;
-  cprintf("cpu %d: panic: ", cpuid());
+  // use lapiccpunum so that we can call panic from mycpu()
+  cprintf("cpu %d: panic: ", lapiccpunum());
  cprintf(s);
  cprintf("\n");
  getcallerpcs(&s, pcs);

--- a/proc.c
+++ b/proc.c
@@ -36,12 +36,8 @@ cpuid() {
 struct cpu*
 mycpu(void)
 {
-  if(readeflags()&FL_IF){
+  if(readeflags()&FL_IF)
-    // Would prefer to panic but panic calls mycpu().
+    panic("mycpu called with interrupts enabled\n");
-    cprintf("mycpu called from %x with interrupts enabled\n",
-        __builtin_return_address(0));
-  }
  return &cpus[lapiccpunum()];
 }