PERFORCE change 80233 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=80233

Change 80233 by peter at peter_overcee on 2005/07/15 02:42:26

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/exception.S#42 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#139 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#70 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#76 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#47 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/exception.S#42 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#139 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/trap.c#70 (text+ko) ====

@@ -219,9 +219,9 @@
 			    type);
 			/*
 			 * We shouldn't enable interrupts while in a critical
-			 * section.
+			 * section or servicing an NMI.
 			 */
-			if (td->td_critnest == 0)
+			if (type != T_NMI && td->td_critnest == 0)
 				enable_intr();
 		}
 	}

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#76 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/isa/clock.c#47 (text+ko) ====