diff options
| author | kato <kato@FreeBSD.org> | 1997-09-06 01:19:10 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-09-06 01:19:10 +0000 |
| commit | 669c3ef94707944609b06ab2bafdca1230fa7a04 (patch) | |
| tree | 7ae6f89367111a63a0d5560b3df459510d75cde3 | |
| parent | b749597298e46ba0918f9581e38a2979fe7858b6 (diff) | |
| download | FreeBSD-src-669c3ef94707944609b06ab2bafdca1230fa7a04.zip FreeBSD-src-669c3ef94707944609b06ab2bafdca1230fa7a04.tar.gz | |
Synchronize with sys/i386/i386/trap.c revision 1.110.
| -rw-r--r-- | sys/pc98/i386/trap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/pc98/i386/trap.c b/sys/pc98/i386/trap.c index cdd9380..202bed8 100644 --- a/sys/pc98/i386/trap.c +++ b/sys/pc98/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.33 1997/08/27 08:43:21 kato Exp $ + * $Id: trap.c,v 1.34 1997/08/29 08:15:57 kato Exp $ */ /* @@ -775,8 +775,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); @@ -821,9 +823,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 "); @@ -878,8 +877,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"); } |
