svn commit: r210420 - stable/8/sys/amd64/amd64

[John Baldwin]

Author: jhb
Date: Fri Jul 23 15:32:22 2010
New Revision: 210420
URL: http://svn.freebsd.org/changeset/base/210420

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

Modified:
  stable/8/sys/amd64/amd64/trap.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/amd64/trap.c
==============================================================================
--- stable/8/sys/amd64/amd64/trap.c	Fri Jul 23 15:26:32 2010	(r210419)
+++ stable/8/sys/amd64/amd64/trap.c	Fri Jul 23 15:32:22 2010	(r210420)
@@ -271,9 +271,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();
 		}
 	}