xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 289bbef733c00be99491499dae63ae3ae1952fdb
parent f73b81205e6c3ffc14b6f657f50ce3dd1fc99722
Author: kolya <kolya>
Date:   Sun, 12 Oct 2008 20:19:16 +0000

minor cleanup

Diffstat:
Mconsole.c | 2+-
Mlapic.c | 4++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 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 @@ -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)