mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-01 17:00:36 +00:00
Code Issues Releases Activity

MFamd64: Don't whine about interrupts being disabled for an NMI.

Browse Source
This commit is contained in:
John Baldwin 2012-02-27 17:31:38 +00:00
parent 45096d8c43
commit 9e30e6dee9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232231
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/i386/i386/trap.c
View File

@ -304,8 +304,9 @@ trap(struct trapframe *frame)
uprintf(
"pid %ld (%s): trap %d with interrupts disabled\n",
(long)curproc->p_pid, curthread->td_name, type);
else if (type != T_BPTFLT && type != T_TRCTRAP &&
frame->tf_eip != (int)cpu_switch_load_gs) {
else if (type != T_NMI && type != T_BPTFLT &&
type != T_TRCTRAP &&
frame->tf_eip != (int)cpu_switch_load_gs) {
/*
* XXX not quite right, since this may be for a
* multiple fault in user mode.
@ -315,9 +316,9 @@ trap(struct trapframe *frame)
/*
* Page faults need interrupts disabled until later,
* and we shouldn't enable interrupts while holding
* a spin lock or if servicing an NMI.
* a spin lock.
*/
if (type != T_NMI && type != T_PAGEFLT &&
if (type != T_PAGEFLT &&
td->td_md.md_spinlock_count == 0)
enable_intr();
}