diff options
| author | peter <peter@FreeBSD.org> | 1997-09-05 08:54:55 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-09-05 08:54:55 +0000 |
| commit | 1428bb8823428b5a4d0e90a03297865a44388dba (patch) | |
| tree | f9d354c7ab47548434e4408ee76cbaf6262825c3 /sys/i386 | |
| parent | eaafbd1c6721f5f9ab3f9e87ddbcc80cdf17d081 (diff) | |
| download | FreeBSD-src-1428bb8823428b5a4d0e90a03297865a44388dba.zip FreeBSD-src-1428bb8823428b5a4d0e90a03297865a44388dba.tar.gz | |
Cosmetic adjustment for the trap/double fault/panic cpu id listing.
It now prints the apic id in hex rather than decimal.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/trap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index b27583f..9cbd539 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.108 1997/08/26 18:10:33 peter Exp $ + * $Id: trap.c,v 1.109 1997/08/28 14:36:54 jlemon Exp $ */ /* @@ -725,8 +725,10 @@ trap_fatal(frame) frame->tf_eflags & PSL_VM ? "vm86" : ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel"); #ifdef SMP - printf("cpuid = %d\n", cpuid); - printf("lapic.id = %d\n", lapic.id); + /* three seperate prints in case of a trap on an unmapped page */ + printf("mp_lock = %08x; ", mp_lock); + printf("cpuid = %d; ", cpuid); + printf("lapic.id = %08x\n", lapic.id); #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%x\n", eva); @@ -771,9 +773,6 @@ trap_fatal(frame) } else { printf("Idle\n"); } -#ifdef SMP - printf("mp_lock = %08x\n", mp_lock); -#endif printf("interrupt mask = "); if ((cpl & net_imask) == net_imask) printf("net "); @@ -828,8 +827,10 @@ dblfault_handler() printf("esp = 0x%x\n", common_tss.tss_esp); printf("ebp = 0x%x\n", common_tss.tss_ebp); #ifdef SMP - printf("cpuid = %d\n", cpuid); - printf("lapic.id = %d\n", lapic.id); + /* three seperate prints in case of a trap on an unmapped page */ + printf("mp_lock = %08x; ", mp_lock); + printf("cpuid = %d; ", cpuid); + printf("lapic.id = %08x\n", lapic.id); #endif panic("double fault"); } |
