diff options
author | kolya <kolya> | 2008-10-12 20:19:16 +0000 |
---|---|---|
committer | kolya <kolya> | 2008-10-12 20:19:16 +0000 |
commit | 289bbef733c00be99491499dae63ae3ae1952fdb (patch) | |
tree | 983740f53eeb0d8ea7540c5129626240f4fef9f3 | |
parent | f73b81205e6c3ffc14b6f657f50ce3dd1fc99722 (diff) | |
download | xv6-labs-289bbef733c00be99491499dae63ae3ae1952fdb.tar.gz xv6-labs-289bbef733c00be99491499dae63ae3ae1952fdb.tar.bz2 xv6-labs-289bbef733c00be99491499dae63ae3ae1952fdb.zip |
minor cleanup
-rw-r--r-- | console.c | 2 | ||||
-rw-r--r-- | lapic.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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); @@ -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) |