Date: Mon, 27 Feb 2012 17:31:38 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r232231 - head/sys/i386/i386 Message-ID: <201202271731.q1RHVcMJ029219@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Mon Feb 27 17:31:38 2012 New Revision: 232231 URL: http://svn.freebsd.org/changeset/base/232231 Log: MFamd64: Don't whine about interrupts being disabled for an NMI. Modified: head/sys/i386/i386/trap.c Modified: head/sys/i386/i386/trap.c ============================================================================== --- head/sys/i386/i386/trap.c Mon Feb 27 17:30:21 2012 (r232230) +++ head/sys/i386/i386/trap.c Mon Feb 27 17:31:38 2012 (r232231) @@ -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(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202271731.q1RHVcMJ029219>