PERFORCE change 86435 for review

[Peter Wemm]

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

Change 86435 by peter at peter_daintree on 2005/11/07 19:49:21

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/trap.c#80 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#83 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#22 integrate

Differences ...

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

@@ -167,6 +167,7 @@
 	PCPU_LAZY_INC(cnt.v_trap);
 	type = frame.tf_trapno;
 
+#ifdef SMP
 #ifdef STOP_NMI
 	/* Handler for NMI IPIs used for stopping CPUs. */
 	if (type == T_NMI) {
@@ -174,6 +175,7 @@
 	                   goto out;
 	}
 #endif /* STOP_NMI */
+#endif /* SMP */
 
 #ifdef KDB
 	if (kdb_active) {

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


==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#22 (text+ko) ====