From owner-p4-projects@FreeBSD.ORG Wed Oct 22 18:45:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A23116A4C0; Wed, 22 Oct 2003 18:45:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D92E816A4B3 for ; Wed, 22 Oct 2003 18:45:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33B6F43F75 for ; Wed, 22 Oct 2003 18:45:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9N1jTXJ047281 for ; Wed, 22 Oct 2003 18:45:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9N1jSUk047278 for perforce@freebsd.org; Wed, 22 Oct 2003 18:45:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 22 Oct 2003 18:45:28 -0700 (PDT) Message-Id: <200310230145.h9N1jSUk047278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 40229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2003 01:45:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=40229 Change 40229 by rwatson@rwatson_paprika on 2003/10/22 18:45:17 Slide slightly further forward to trustedbsd_mac@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) ====