Fix various places that were testing td_critnest to see if interrupts

should remain disabled during a trap or not to check
td_md.md_spinlock_count instead.

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index c6945af..d392374 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -240,11 +240,11 @@ trap(frame)
 			    type);
 			/*
 			 * Page faults need interrupts disabled until later,
-			 * and we shouldn't enable interrupts while in a
-			 * critical section or if servicing an NMI.
+			 * and we shouldn't enable interrupts while holding
+			 * a spin lock or if servicing an NMI.
 			 */
 			if (type != T_NMI && type != T_PAGEFLT &&
-			    td->td_critnest == 0)
+			    td->td_md.md_spinlock_count == 0)
 				enable_intr();
 		}
 	}