PERFORCE change 29024 for review

[John Baldwin]

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

Change 29024 by jhb at jhb_laptop on 2003/04/15 14:07:43

	IFC @29023 so that LINT works again.

Affected files ...

.. //depot/projects/smpng/sys/conf/options#52 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#14 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#7 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#14 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#10 integrate

Differences ...

==== //depot/projects/smpng/sys/conf/options#52 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.389 2003/04/15 19:43:52 rwatson Exp $
+# $FreeBSD: src/sys/conf/options,v 1.391 2003/04/15 20:59:43 jhb Exp $
 #
 #        On the handling of kernel options
 #
@@ -118,7 +118,6 @@
 MD_ROOT		opt_md.h
 MD_ROOT_SIZE	opt_md.h
 NDGBPORTS	opt_dgb.h
-NO_COMPAT_FREEBSD4	opt_compat.h
 NSWAPDEV	opt_swap.h
 NSWBUF_MIN	opt_swap.h
 NTIMECOUNTER	opt_ntp.h
@@ -434,6 +433,8 @@
 LPT_DEBUG		opt_lpt.h
 PLIP_DEBUG		opt_plip.h
 LOCKF_DEBUG		opt_debug_lockf.h
+MUTEX_DEBUG		opt_global.h
+MUTEX_PROFILING		opt_global.h
 NPX_DEBUG		opt_debug_npx.h
 NETATALKDEBUG		opt_atalk.h
 SI_DEBUG		opt_debug_si.h

==== //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#14 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.57 2003/03/27 19:26:38 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.58 2003/04/15 20:51:17 rwatson Exp $
  */
 
 /*
@@ -2751,4 +2751,4 @@
 };
 
 MAC_POLICY_SET(&mac_biba_ops, mac_biba, "TrustedBSD MAC/Biba",
-    MPC_LOADTIME_FLAG_NOTLATE, &mac_biba_slot);
+    MPC_LOADTIME_FLAG_NOTLATE | MPC_LOADTIME_FLAG_LABELMBUFS, &mac_biba_slot);

==== //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.11 2003/03/26 15:12:02 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.12 2003/04/15 20:51:17 rwatson Exp $
  */
 
 /*
@@ -2734,4 +2734,4 @@
 };
 
 MAC_POLICY_SET(&mac_lomac_ops, mac_lomac, "TrustedBSD MAC/LOMAC",
-    MPC_LOADTIME_FLAG_NOTLATE, &mac_lomac_slot);
+    MPC_LOADTIME_FLAG_NOTLATE | MPC_LOADTIME_FLAG_LABELMBUFS, &mac_lomac_slot);

==== //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#14 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.44 2003/03/27 19:26:38 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.45 2003/04/15 20:51:18 rwatson Exp $
  */
 
 /*
@@ -2507,4 +2507,4 @@
 };
 
 MAC_POLICY_SET(&mac_mls_ops, mac_mls, "TrustedBSD MAC/MLS",
-    MPC_LOADTIME_FLAG_NOTLATE, &mac_mls_slot);
+    MPC_LOADTIME_FLAG_NOTLATE | MPC_LOADTIME_FLAG_LABELMBUFS, &mac_mls_slot);

==== //depot/projects/smpng/sys/security/mac_test/mac_test.c#10 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.25 2003/03/27 19:26:39 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.26 2003/04/15 20:51:18 rwatson Exp $
  */
 
 /*
@@ -1496,4 +1496,4 @@
 };
 
 MAC_POLICY_SET(&mac_test_ops, mac_test, "TrustedBSD MAC/Test",
-    MPC_LOADTIME_FLAG_UNLOADOK, &test_slot);
+    MPC_LOADTIME_FLAG_UNLOADOK | MPC_LOADTIME_FLAG_LABELMBUFS, &test_slot);