talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize with sys/i386/i386/trap.c revision 1.110.

This commit is contained in:
KATO Takenori 1997-09-06 01:19:10 +00:00
parent b61ab30e6b
commit 478da40f6c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/pc98/i386/trap.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * 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" : frame->tf_eflags & PSL_VM ? "vm86" :
ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel"); ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel");
#ifdef SMP #ifdef SMP
printf("cpuid = %d\n", cpuid); /* three seperate prints in case of a trap on an unmapped page */
printf("lapic.id = %d\n", lapic.id); printf("mp_lock = %08x; ", mp_lock);
printf("cpuid = %d; ", cpuid);
printf("lapic.id = %08x\n", lapic.id);
#endif #endif
if (type == T_PAGEFLT) { if (type == T_PAGEFLT) {
printf("fault virtual address = 0x%x\n", eva); printf("fault virtual address = 0x%x\n", eva);
@ -821,9 +823,6 @@ trap_fatal(frame)
} else { } else {
printf("Idle\n"); printf("Idle\n");
} }
#ifdef SMP
printf("mp_lock = %08x\n", mp_lock);
#endif
printf("interrupt mask = "); printf("interrupt mask = ");
if ((cpl & net_imask) == net_imask) if ((cpl & net_imask) == net_imask)
printf("net "); printf("net ");
@ -878,8 +877,10 @@ dblfault_handler()
printf("esp = 0x%x\n", common_tss.tss_esp); printf("esp = 0x%x\n", common_tss.tss_esp);
printf("ebp = 0x%x\n", common_tss.tss_ebp); printf("ebp = 0x%x\n", common_tss.tss_ebp);
#ifdef SMP #ifdef SMP
printf("cpuid = %d\n", cpuid); /* three seperate prints in case of a trap on an unmapped page */
printf("lapic.id = %d\n", lapic.id); printf("mp_lock = %08x; ", mp_lock);
printf("cpuid = %d; ", cpuid);
printf("lapic.id = %08x\n", lapic.id);
#endif #endif
panic("double fault"); panic("double fault");
} }