minor cleanup

diff --git a/console.c b/console.c
index 86815407714ae8f364c057edb12f24bfca720fd5..87c3713b0181c6d9702699e1f9b861bf931bfbdd 100644 (file)
--- a/console.c
+++ b/console.c
@@ -290,7 +290,7 @@ panic(char *s)
   int i;
   uint pcs[10];
   
-  __asm __volatile("cli");
+  cli();
   use_console_lock = 0;
   cprintf("cpu%d: panic: ", cpu());
   cprintf(s);

diff --git a/lapic.c b/lapic.c
index 2f430320a313d47704a2ffaff9139c97b97a0577..4bc3e7c1befe06f6d8375e7ba9ad15f4e845a64c 100644 (file)
--- a/lapic.c
+++ b/lapic.c
@@ -97,8 +97,8 @@ cpu(void)
   // Cannot call cpu when interrupts are enabled:
   // result not guaranteed to last long enough to be used!
   // Would prefer to panic but even printing is chancy here:
-  // everything, including cprintf, calls cpu, at least indirectly
-  // through acquire and release.
+  // almost everything, including cprintf and panic, calls cpu,
+  // often indirectly through acquire and release.
   if(read_eflags()&FL_IF){
     static int n;
     if(n++ == 0)