diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_shutdown.c | 7 | ||||
| -rw-r--r-- | sys/kern/subr_trap.c | 17 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index caaeb02..b3021aa 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $Id: kern_shutdown.c,v 1.22 1997/08/31 23:08:38 bde Exp $ + * $Id: kern_shutdown.c,v 1.23 1997/09/02 20:05:41 bde Exp $ */ #include "opt_ddb.h" @@ -403,7 +403,10 @@ panic(const char *fmt, ...) va_end(ap); printf("\n"); #ifdef SMP - printf(" cpuid %d\n", cpuid); + /* three seperate prints in case of an unmapped page and trap */ + printf("mp_lock = %08x; ", mp_lock); + printf("cpuid = %d; ", cpuid); + printf("lapic.id = %08x\n", lapic.id); #endif #if defined(DDB) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index b27583f..9cbd539 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_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"); } |
