x86: print trap name in addition of trap number
for the "trap with interrupts disabled" warning. Reviewed by: jhb Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D36302
This commit is contained in:
parent
0f906b30e6
commit
01a33b2af5
@ -277,8 +277,10 @@ trap(struct trapframe *frame)
|
||||
*/
|
||||
if (TRAPF_USERMODE(frame)) {
|
||||
uprintf(
|
||||
"pid %ld (%s): trap %d with interrupts disabled\n",
|
||||
(long)curproc->p_pid, curthread->td_name, type);
|
||||
"pid %ld (%s): trap %d (%s) "
|
||||
"with interrupts disabled\n",
|
||||
(long)curproc->p_pid, curthread->td_name, type,
|
||||
trap_msg[type]);
|
||||
} else {
|
||||
switch (type) {
|
||||
case T_NMI:
|
||||
|
@ -283,8 +283,10 @@ trap(struct trapframe *frame)
|
||||
*/
|
||||
if ((frame->tf_eflags & PSL_I) == 0 && TRAPF_USERMODE(frame) &&
|
||||
(curpcb->pcb_flags & PCB_VM86CALL) == 0)
|
||||
uprintf("pid %ld (%s): trap %d with interrupts disabled\n",
|
||||
(long)curproc->p_pid, curthread->td_name, type);
|
||||
uprintf("pid %ld (%s): usermode trap %d (%s) with "
|
||||
"interrupts disabled\n",
|
||||
(long)curproc->p_pid, curthread->td_name, type,
|
||||
trap_data[type].msg);
|
||||
|
||||
/*
|
||||
* Conditionally reenable interrupts. If we hold a spin lock,
|
||||
|
Loading…
Reference in New Issue
Block a user