Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Jul 2010 20:45:37 +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: r209956 - head/sys/amd64/amd64
Message-ID:  <201007122045.o6CKjbZn012735@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Mon Jul 12 20:45:37 2010
New Revision: 209956
URL: http://svn.freebsd.org/changeset/base/209956

Log:
  Remove a dead test.  We already exclude NMI traps from this code in an
  earlier condition.
  
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/trap.c

Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c	Mon Jul 12 19:59:15 2010	(r209955)
+++ head/sys/amd64/amd64/trap.c	Mon Jul 12 20:45:37 2010	(r209956)
@@ -268,9 +268,9 @@ trap(struct trapframe *frame)
 
 			/*
 			 * We shouldn't enable interrupts while holding a
-			 * spin lock or servicing an NMI.
+			 * spin lock.
 			 */
-			if (type != T_NMI && td->td_md.md_spinlock_count == 0)
+			if (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?201007122045.o6CKjbZn012735>