summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkolya <kolya>2008-10-12 20:19:16 +0000
committerkolya <kolya>2008-10-12 20:19:16 +0000
commit289bbef733c00be99491499dae63ae3ae1952fdb (patch)
tree983740f53eeb0d8ea7540c5129626240f4fef9f3
parentf73b81205e6c3ffc14b6f657f50ce3dd1fc99722 (diff)
downloadxv6-labs-289bbef733c00be99491499dae63ae3ae1952fdb.tar.gz
xv6-labs-289bbef733c00be99491499dae63ae3ae1952fdb.tar.bz2
xv6-labs-289bbef733c00be99491499dae63ae3ae1952fdb.zip
minor cleanup
-rw-r--r--console.c2
-rw-r--r--lapic.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/console.c b/console.c
index 8681540..87c3713 100644
--- 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 2f43032..4bc3e7c 100644
--- 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)