svn commit: r210421 - stable/7/sys/amd64/amd64
John Baldwin
jhb at FreeBSD.org
Fri Jul 23 15:32:44 UTC 2010
Author: jhb
Date: Fri Jul 23 15:32:44 2010
New Revision: 210421
URL: http://svn.freebsd.org/changeset/base/210421
Log:
MFC 209956:
Remove a dead test. We already exclude NMI traps from this code in an
earlier condition.
Modified:
stable/7/sys/amd64/amd64/trap.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/amd64/amd64/trap.c
==============================================================================
--- stable/7/sys/amd64/amd64/trap.c Fri Jul 23 15:32:22 2010 (r210420)
+++ stable/7/sys/amd64/amd64/trap.c Fri Jul 23 15:32:44 2010 (r210421)
@@ -275,9 +275,9 @@ trap(struct trapframe *frame)
type);
/*
* 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();
}
}
More information about the svn-src-stable-7
mailing list