PERFORCE change 42044 for review

[John Baldwin]

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

Change 42044 by jhb at jhb_blue on 2003/11/11 13:44:48

	IFC @42043 to get subr_turnstile.c repocopy.  Peter still needs to
	axe the kern_turnstile.c,v file.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/mptable.c#4 integrate
.. //depot/projects/smpng/sys/kern/kern_turnstile.c#1 branch
.. //depot/projects/smpng/sys/kern/subr_turnstile.c#1 branch
.. //depot/projects/smpng/sys/modules/mac_stub/Makefile#2 integrate

Differences ...

==== //depot/projects/smpng/sys/i386/i386/mptable.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.224 2003/11/11 17:14:26 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.225 2003/11/11 21:19:43 jhb Exp $");
 
 #include "opt_mptable_force_htt.h"
 #include <sys/param.h>
@@ -893,6 +893,8 @@
 		return (EINVAL);
 	if (pci0 == -1 || pci0 + bus > mptable_maxbusid)
 		return (ENXIO);
+	if (busses[pci0 + bus].bus_type != PCI)
+		return (ENXIO);
 	args.bus = pci0 + bus;
 	args.found = 0;
 	mptable_walk_table(mptable_pci_probe_table_handler, &args);

==== //depot/projects/smpng/sys/modules/mac_stub/Makefile#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/modules/mac_stub/Makefile,v 1.3 2003/08/21 15:43:01 rwatson Exp $
+# $FreeBSD: src/sys/modules/mac_stub/Makefile,v 1.4 2003/11/11 21:23:54 rwatson Exp $
 
-.PATH: ${.CURDIR}/../../security/mac_none
+.PATH: ${.CURDIR}/../../security/mac_stub
 
-KMOD=	mac_none
+KMOD=	mac_stub
 SRCS=	vnode_if.h \
-	mac_none.c
+	mac_stub.c
 
 .include <bsd.kmod.mk>