Synchronize with sys/i386/i386/trap.c revision 1.110.
This commit is contained in:
parent
b749597298
commit
669c3ef947
@ -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");
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user