minor cleanup
This commit is contained in:
parent
f73b81205e
commit
289bbef733
2 changed files with 3 additions and 3 deletions
|
@ -290,7 +290,7 @@ panic(char *s)
|
||||||
int i;
|
int i;
|
||||||
uint pcs[10];
|
uint pcs[10];
|
||||||
|
|
||||||
__asm __volatile("cli");
|
cli();
|
||||||
use_console_lock = 0;
|
use_console_lock = 0;
|
||||||
cprintf("cpu%d: panic: ", cpu());
|
cprintf("cpu%d: panic: ", cpu());
|
||||||
cprintf(s);
|
cprintf(s);
|
||||||
|
|
4
lapic.c
4
lapic.c
|
@ -97,8 +97,8 @@ cpu(void)
|
||||||
// Cannot call cpu when interrupts are enabled:
|
// Cannot call cpu when interrupts are enabled:
|
||||||
// result not guaranteed to last long enough to be used!
|
// result not guaranteed to last long enough to be used!
|
||||||
// Would prefer to panic but even printing is chancy here:
|
// Would prefer to panic but even printing is chancy here:
|
||||||
// everything, including cprintf, calls cpu, at least indirectly
|
// almost everything, including cprintf and panic, calls cpu,
|
||||||
// through acquire and release.
|
// often indirectly through acquire and release.
|
||||||
if(read_eflags()&FL_IF){
|
if(read_eflags()&FL_IF){
|
||||||
static int n;
|
static int n;
|
||||||
if(n++ == 0)
|
if(n++ == 0)
|
||||||
|
|
Loading…
Reference in a new issue