PERFORCE change 40229 for review

[Robert Watson]

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

Change 40229 by rwatson at rwatson_paprika on 2003/10/22 18:45:17

	Slide slightly further forward to trustedbsd_mac at 37200.  Also
	bring in pending deletes of vm_swap.c and old 802.11 code,
	some files from libpthread.  Mostly, this just brings in the
	MAC Framework compile-time options for features such as
	MAC_STATIC.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/lib/libpthread/arch/amd64/include/ksd.h#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/arch/i386/i386/ksd.c#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/arch/i386/include/ksd.h#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/arch/ia64/include/ksd.h#2 delete
.. //depot/projects/trustedbsd/sebsd/release/ia64/doFS.sh#3 delete
.. //depot/projects/trustedbsd/sebsd/sys/conf/options#5 integrate
.. //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#6 integrate
.. //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#6 integrate
.. //depot/projects/trustedbsd/sebsd/sys/net/if_ieee80211subr.c#2 delete
.. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#6 integrate
.. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#6 integrate
.. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#6 integrate
.. //depot/projects/trustedbsd/sebsd/sys/vm/vm_swap.c#4 delete

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/conf/options#5 (text+ko) ====

@@ -115,6 +115,7 @@
 MAC_PARTITION	opt_dontuse.h
 MAC_PORTACL	opt_dontuse.h
 MAC_SEEOTHERUIDS	opt_dontuse.h
+MAC_STATIC	opt_mac.h
 MAC_STUB	opt_dontuse.h
 MAC_TEST	opt_dontuse.h
 MD_ROOT		opt_md.h

==== //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#6 (text+ko) ====

@@ -31,7 +31,9 @@
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 options 	MAC
-options 	MAC_DEBUG
+#options 	MAC_ALWAYS_LABEL_MBUF
+#options 	MAC_DEBUG
+#options 	MAC_STATIC
 options 	UFS_EXTATTR
 options 	UFS_EXTATTR_AUTOSTART
 

==== //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.155 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp 
  */
 
 #include "opt_compat.h"

==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#6 (text+ko) ====


==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#6 (text+ko) ====


==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#6 (text+ko) ====


==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#6 (text+ko) ====

To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message