From owner-p4-projects@FreeBSD.ORG  Mon Oct 23 04:01:56 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D94A816A492; Mon, 23 Oct 2006 04:01:55 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 9B85A16A47C
	for <perforce@freebsd.org>; Mon, 23 Oct 2006 04:01:55 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A95C143D46
	for <perforce@freebsd.org>; Mon, 23 Oct 2006 04:01:52 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9N41oi1024049
	for <perforce@freebsd.org>; Mon, 23 Oct 2006 04:01:50 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9N41ngF024035
	for perforce@freebsd.org; Mon, 23 Oct 2006 04:01:49 GMT
	(envelope-from mjacob@freebsd.org)
Date: Mon, 23 Oct 2006 04:01:49 GMT
Message-Id: <200610230401.k9N41ngF024035@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108288 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Oct 2006 04:01:56 -0000

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

Change 108288 by mjacob@newisp on 2006/10/23 04:01:31

	IFC

Affected files ...

.. //depot/projects/newisp/boot/arm/Makefile#2 integrate
.. //depot/projects/newisp/compat/linux/linux_file.c#4 integrate
.. //depot/projects/newisp/compat/linux/linux_getcwd.c#2 integrate
.. //depot/projects/newisp/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/newisp/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/newisp/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/newisp/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/newisp/conf/files#8 integrate
.. //depot/projects/newisp/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/newisp/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/newisp/dev/iwi/if_iwireg.h#2 integrate
.. //depot/projects/newisp/fs/devfs/devfs_devs.c#4 integrate
.. //depot/projects/newisp/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/newisp/i386/i386/sys_machdep.c#3 integrate
.. //depot/projects/newisp/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/newisp/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/newisp/kern/init_main.c#3 integrate
.. //depot/projects/newisp/kern/kern_acct.c#3 integrate
.. //depot/projects/newisp/kern/kern_acl.c#2 integrate
.. //depot/projects/newisp/kern/kern_alq.c#2 integrate
.. //depot/projects/newisp/kern/kern_environment.c#2 integrate
.. //depot/projects/newisp/kern/kern_exec.c#4 integrate
.. //depot/projects/newisp/kern/kern_exit.c#4 integrate
.. //depot/projects/newisp/kern/kern_fork.c#2 integrate
.. //depot/projects/newisp/kern/kern_jail.c#3 integrate
.. //depot/projects/newisp/kern/kern_ktrace.c#2 integrate
.. //depot/projects/newisp/kern/kern_linker.c#2 integrate
.. //depot/projects/newisp/kern/kern_mac.c#3 integrate
.. //depot/projects/newisp/kern/kern_mbuf.c#3 integrate
.. //depot/projects/newisp/kern/kern_prot.c#3 integrate
.. //depot/projects/newisp/kern/kern_shutdown.c#2 integrate
.. //depot/projects/newisp/kern/kern_sysctl.c#2 integrate
.. //depot/projects/newisp/kern/kern_time.c#3 integrate
.. //depot/projects/newisp/kern/link_elf.c#2 integrate
.. //depot/projects/newisp/kern/link_elf_obj.c#2 integrate
.. //depot/projects/newisp/kern/subr_fattime.c#1 branch
.. //depot/projects/newisp/kern/subr_trap.c#3 integrate
.. //depot/projects/newisp/kern/sys_pipe.c#2 integrate
.. //depot/projects/newisp/kern/sys_socket.c#2 integrate
.. //depot/projects/newisp/kern/sysv_msg.c#3 integrate
.. //depot/projects/newisp/kern/sysv_sem.c#3 integrate
.. //depot/projects/newisp/kern/sysv_shm.c#3 integrate
.. //depot/projects/newisp/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/newisp/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/newisp/kern/uipc_sem.c#2 integrate
.. //depot/projects/newisp/kern/uipc_socket.c#5 integrate
.. //depot/projects/newisp/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/newisp/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/newisp/kern/vfs_lookup.c#3 integrate
.. //depot/projects/newisp/kern/vfs_mount.c#5 integrate
.. //depot/projects/newisp/kern/vfs_subr.c#5 integrate
.. //depot/projects/newisp/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/newisp/kern/vfs_vnops.c#2 integrate
.. //depot/projects/newisp/net/bpf.c#2 integrate
.. //depot/projects/newisp/net/bsd_comp.c#2 integrate
.. //depot/projects/newisp/net/if.c#3 integrate
.. //depot/projects/newisp/net/if_atmsubr.c#2 integrate
.. //depot/projects/newisp/net/if_ethersubr.c#2 integrate
.. //depot/projects/newisp/net/if_fddisubr.c#2 integrate
.. //depot/projects/newisp/net/if_fwsubr.c#2 integrate
.. //depot/projects/newisp/net/if_gif.c#2 integrate
.. //depot/projects/newisp/net/if_iso88025subr.c#2 integrate
.. //depot/projects/newisp/net/if_ppp.c#3 integrate
.. //depot/projects/newisp/net/if_stf.c#2 integrate
.. //depot/projects/newisp/net/if_tun.c#2 integrate
.. //depot/projects/newisp/netatalk/aarp.c#2 integrate
.. //depot/projects/newisp/netatalk/ddp_input.c#2 integrate
.. //depot/projects/newisp/netatalk/ddp_output.c#2 integrate
.. //depot/projects/newisp/netinet/if_ether.c#4 integrate
.. //depot/projects/newisp/netinet/igmp.c#2 integrate
.. //depot/projects/newisp/netinet/in_pcb.c#3 integrate
.. //depot/projects/newisp/netinet/ip_divert.c#2 integrate
.. //depot/projects/newisp/netinet/ip_fw2.c#5 integrate
.. //depot/projects/newisp/netinet/ip_icmp.c#2 integrate
.. //depot/projects/newisp/netinet/ip_input.c#4 integrate
.. //depot/projects/newisp/netinet/ip_mroute.c#3 integrate
.. //depot/projects/newisp/netinet/ip_options.c#2 integrate
.. //depot/projects/newisp/netinet/ip_output.c#6 integrate
.. //depot/projects/newisp/netinet/raw_ip.c#3 integrate
.. //depot/projects/newisp/netinet/tcp_input.c#6 integrate
.. //depot/projects/newisp/netinet/tcp_output.c#5 integrate
.. //depot/projects/newisp/netinet/tcp_subr.c#7 integrate
.. //depot/projects/newisp/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/newisp/netinet/udp_usrreq.c#4 integrate
.. //depot/projects/newisp/netinet6/nd6.c#4 integrate
.. //depot/projects/newisp/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/newisp/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/newisp/pci/agp.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_framework.h#2 integrate
.. //depot/projects/newisp/security/mac/mac_inet.c#4 integrate
.. //depot/projects/newisp/security/mac/mac_label.c#2 integrate
.. //depot/projects/newisp/security/mac/mac_net.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_pipe.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_posix_sem.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_process.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_socket.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_system.c#2 integrate
.. //depot/projects/newisp/security/mac/mac_sysv_msg.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_sysv_sem.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_sysv_shm.c#3 integrate
.. //depot/projects/newisp/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/newisp/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/newisp/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/newisp/sys/clock.h#3 integrate
.. //depot/projects/newisp/sys/mac.h#3 integrate
.. //depot/projects/newisp/sys/mac_policy.h#4 integrate
.. //depot/projects/newisp/ufs/ffs/ffs_vfsops.c#3 integrate
.. //depot/projects/newisp/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/newisp/vm/swap_pager.c#2 integrate
.. //depot/projects/newisp/vm/vm_mmap.c#2 integrate
.. //depot/projects/newisp/vm/vm_object.c#3 integrate
.. //depot/projects/newisp/vm/vm_page.c#5 integrate

Differences ...

==== //depot/projects/newisp/boot/arm/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/boot/arm/Makefile,v 1.2 2006/08/18 21:37:27 imp Exp $
+# $FreeBSD: src/sys/boot/arm/Makefile,v 1.3 2006/10/23 00:05:28 imp Exp $
 
-SUBDIR=at91
+SUBDIR=
 
 .include <bsd.subdir.mk>

==== //depot/projects/newisp/compat/linux/linux_file.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.98 2006/09/23 19:06:54 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.99 2006/10/22 11:52:11 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -40,7 +40,6 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
@@ -52,6 +51,8 @@
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <ufs/ufs/extattr.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/ufsmount.h>

==== //depot/projects/newisp/compat/linux/linux_getcwd.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.24 2006/03/19 11:10:33 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.25 2006/10/22 11:52:11 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -54,7 +54,6 @@
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <ufs/ufs/dir.h>	/* XXX only for DIRBLKSIZ */
@@ -68,6 +67,8 @@
 #endif
 #include <compat/linux/linux_util.h>
 
+#include <security/mac/mac_framework.h>
+
 static int
 linux_getcwd_scandir(struct vnode **, struct vnode **,
     char **, char *, struct thread *);

==== //depot/projects/newisp/compat/linux/linux_misc.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.188 2006/10/08 17:08:27 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.189 2006/10/22 11:52:11 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -43,7 +43,6 @@
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
@@ -63,6 +62,8 @@
 #include <sys/vnode.h>
 #include <sys/wait.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>

==== //depot/projects/newisp/compat/linux/linux_stats.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.84 2006/08/27 08:56:54 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.85 2006/10/22 11:52:11 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -38,7 +38,6 @@
 #include <sys/filedesc.h>
 #include <sys/proc.h>
 #include <sys/jail.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
@@ -59,6 +58,8 @@
 
 #include <compat/linux/linux_util.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * XXX: This was removed from newstat_copyout(), and almost identical
  * XXX: code was in stat64_copyout().  findcdev() needs to be replaced

==== //depot/projects/newisp/compat/svr4/svr4_fcntl.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.37 2005/09/28 07:03:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.38 2006/10/22 11:52:11 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -40,7 +40,6 @@
 #include <sys/filedesc.h>
 /*#include <sys/ioctl.h>*/
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
@@ -60,6 +59,8 @@
 #include <compat/svr4/svr4_util.h>
 #include <compat/svr4/svr4_fcntl.h>
 
+#include <security/mac/mac_framework.h>
+
 static int svr4_to_bsd_flags(int);
 static u_long svr4_to_bsd_cmd(u_long);
 static int fd_revoke(struct thread *, int);

==== //depot/projects/newisp/compat/svr4/svr4_misc.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.89 2006/07/21 20:28:56 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.90 2006/10/22 11:52:11 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -45,7 +45,6 @@
 #include <sys/imgact.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/file.h>		/* Must come after sys/malloc.h */
 #include <sys/mman.h>
@@ -83,6 +82,8 @@
 #include <compat/svr4/svr4_mman.h>
 #include <compat/svr4/svr4_wait.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <machine/vmparam.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>

==== //depot/projects/newisp/conf/files#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1152 2006/10/20 06:39:59 imp Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1153 2006/10/22 18:19:08 phk Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -1374,6 +1374,7 @@
 kern/subr_devstat.c		standard
 kern/subr_disk.c		standard
 kern/subr_eventhandler.c	standard
+kern/subr_fattime.c		standard
 kern/subr_firmware.c		optional firmware
 kern/subr_hints.c		standard
 kern/subr_kdb.c			standard

==== //depot/projects/newisp/contrib/pf/net/pf.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.41 2006/09/12 04:25:11 csjp Exp $	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.42 2006/10/22 11:52:11 rwatson Exp $	*/
 /*	$OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */
 
 /*
@@ -79,7 +79,6 @@
 #include <sys/kernel.h>
 #include <sys/time.h>
 #ifdef __FreeBSD__
-#include <sys/mac.h>
 #include <sys/sysctl.h>
 #include <sys/endian.h>
 #else
@@ -132,6 +131,7 @@
 #include <machine/in_cksum.h>
 #include <sys/limits.h>
 #include <sys/ucred.h>
+#include <security/mac/mac_framework.h>
 
 extern int ip_optcopy(struct ip *, struct ip *);
 #endif

==== //depot/projects/newisp/dev/iwi/if_iwi.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.40 2006/10/10 18:02:22 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.41 2006/10/23 00:34:07 mlaier Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -2935,6 +2935,11 @@
 	    IWI_MODE_11G;
 	rs.type = IWI_RATESET_TYPE_NEGOTIATED;
 	rs.nrates = ni->ni_rates.rs_nrates;
+	if (rs.nrates > IWI_RATESET_SIZE) {
+		DPRINTF(("Truncating negotiated rate set from %u\n",
+		    rs.nrates));
+		rs.nrates = IWI_RATESET_SIZE;
+	}
 	memcpy(rs.rates, ni->ni_rates.rs_rates, rs.nrates);
 	DPRINTF(("Setting negotiated rates (%u)\n", rs.nrates));
 	error = iwi_cmd(sc, IWI_CMD_SET_RATES, &rs, sizeof rs);

==== //depot/projects/newisp/dev/iwi/if_iwireg.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.12 2006/04/27 21:43:37 mlaier Exp $	*/
+/*	$FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.13 2006/10/23 00:34:07 mlaier Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -338,7 +338,8 @@
 #define IWI_RATESET_TYPE_SUPPORTED	1
 
 	uint8_t	reserved;
-	uint8_t	rates[12];
+#define	IWI_RATESET_SIZE	12
+	uint8_t	rates[IWI_RATESET_SIZE];
 } __packed;
 
 /* structure for command IWI_CMD_SET_TX_POWER */

==== //depot/projects/newisp/fs/devfs/devfs_devs.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  *
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36
  *
- * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.48 2006/10/18 11:17:14 kib Exp $
+ * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.49 2006/10/22 11:52:12 rwatson Exp $
  */
 
 #include "opt_mac.h"
@@ -37,7 +37,6 @@
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/sx.h>
@@ -49,6 +48,8 @@
 #include <fs/devfs/devfs.h>
 #include <fs/devfs/devfs_int.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * The one true (but secret) list of active devices in the system.
  * Locked by dev_lock()/devmtx

==== //depot/projects/newisp/fs/devfs/devfs_vnops.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43
  *
- * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.138 2006/10/20 08:03:42 kib Exp $
+ * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.139 2006/10/22 11:52:12 rwatson Exp $
  */
 
 /*
@@ -52,7 +52,6 @@
 #include <sys/filio.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
@@ -71,6 +70,8 @@
 #include <fs/devfs/devfs.h>
 #include <fs/devfs/devfs_int.h>
 
+#include <security/mac/mac_framework.h>
+
 struct mtx	devfs_de_interlock;
 MTX_SYSINIT(devfs_de_interlock, &devfs_de_interlock, "devfs interlock", MTX_DEF);
 

==== //depot/projects/newisp/i386/i386/sys_machdep.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.105 2006/09/09 10:20:31 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.106 2006/10/22 11:52:12 rwatson Exp $");
 
 #include "opt_kstack_pages.h"
 #include "opt_mac.h"
@@ -38,7 +38,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
@@ -57,6 +56,7 @@
 #include <machine/sysarch.h>
 
 #include <security/audit/audit.h>
+#include <security/mac/mac_framework.h>
 
 #include <vm/vm_kern.h>		/* for kernel_map */
 

==== //depot/projects/newisp/i386/ibcs2/ibcs2_misc.c#2 (text+ko) ====

@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.64 2006/07/11 20:52:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.65 2006/10/22 11:52:12 rwatson Exp $");
 
 /*
  * IBCS2 compatibility module.
@@ -65,7 +65,6 @@
 #include <sys/imgact.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/file.h>			/* Must come after sys/malloc.h */
 #include <sys/mutex.h>
@@ -90,6 +89,8 @@
 #include <i386/ibcs2/ibcs2_utime.h>
 #include <i386/ibcs2/ibcs2_xenix.h>
 
+#include <security/mac/mac_framework.h>
+
 int
 ibcs2_ulimit(td, uap)
 	struct thread *td;

==== //depot/projects/newisp/ia64/ia64/nexus.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.14 2006/04/21 16:12:28 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.15 2006/10/23 00:38:58 marcel Exp $
  */
 
 /*
@@ -75,9 +75,6 @@
 
 static	int nexus_probe(device_t);
 static	int nexus_attach(device_t);
-static	int nexus_print_resources(struct resource_list *rl, const char *name, int type,
-				  const char *format);
-static	int nexus_print_all_resources(device_t dev);
 static	int nexus_print_child(device_t, device_t);
 static device_t nexus_add_child(device_t bus, int order, const char *name,
 				int unit);
@@ -230,58 +227,16 @@
 }
 
 static int
-nexus_print_resources(struct resource_list *rl, const char *name, int type,
-		      const char *format)
+nexus_print_child(device_t bus, device_t child)
 {
-	struct resource_list_entry *rle;
-	int printed, retval;
-
-	printed = 0;
-	retval = 0;
-	/* Yes, this is kinda cheating */
-	STAILQ_FOREACH(rle, rl, link) {
-		if (rle->type == type) {
-			if (printed == 0)
-				retval += printf(" %s ", name);
-			else if (printed > 0)
-				retval += printf(",");
-			printed++;
-			retval += printf(format, rle->start);
-			if (rle->count > 1) {
-				retval += printf("-");
-				retval += printf(format, rle->start +
-						 rle->count - 1);
-			}
-		}
-	}
-	return retval;
-}
-
-static int
-nexus_print_all_resources(device_t dev)
-{
-	struct	nexus_device *ndev = DEVTONX(dev);
+	struct nexus_device *ndev = DEVTONX(child);
 	struct resource_list *rl = &ndev->nx_resources;
 	int retval = 0;
 
-	if (STAILQ_FIRST(rl) || ndev->nx_pcibus != -1)
-		retval += printf(" at");
-	
-	retval += nexus_print_resources(rl, "port", SYS_RES_IOPORT, "%#lx");
-	retval += nexus_print_resources(rl, "iomem", SYS_RES_MEMORY, "%#lx");
-	retval += nexus_print_resources(rl, "irq", SYS_RES_IRQ, "%ld");
-
-	return retval;
-}
-
-static int
-nexus_print_child(device_t bus, device_t child)
-{
-	struct	nexus_device *ndev = DEVTONX(child);
-	int retval = 0;
-
 	retval += bus_print_child_header(bus, child);
-	retval += nexus_print_all_resources(child);
+	retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
+	retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
+	retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
 	if (ndev->nx_pcibus != -1)
 		retval += printf(" pcibus %d", ndev->nx_pcibus);
 	if (device_get_flags(child))

==== //depot/projects/newisp/kern/init_main.c#3 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.267 2006/09/26 00:15:56 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.268 2006/10/22 11:52:12 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_init_path.h"
@@ -55,7 +55,6 @@
 #include <sys/filedesc.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/syscallsubr.h>
@@ -78,6 +77,7 @@
 #include <machine/cpu.h>
 
 #include <security/audit/audit.h>
+#include <security/mac/mac_framework.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

==== //depot/projects/newisp/kern/kern_acct.c#3 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.83 2006/09/17 11:00:36 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.84 2006/10/22 11:52:12 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -53,7 +53,6 @@
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
@@ -68,6 +67,8 @@
 #include <sys/tty.h>
 #include <sys/vnode.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * The routines implemented in this file are described in:
  *      Leffler, et al.: The Design and Implementation of the 4.3BSD

==== //depot/projects/newisp/kern/kern_acl.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.48 2006/07/06 23:37:38 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.49 2006/10/22 11:52:12 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
@@ -54,6 +53,8 @@
 #include <sys/sysent.h>
 #include <sys/acl.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <vm/uma.h>
 
 uma_zone_t	acl_zone;

==== //depot/projects/newisp/kern/kern_alq.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.15 2006/03/28 21:30:22 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.16 2006/10/22 11:52:12 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -34,7 +34,6 @@
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
@@ -46,6 +45,8 @@
 #include <sys/fcntl.h>
 #include <sys/eventhandler.h>
 
+#include <security/mac/mac_framework.h>
+
 /* Async. Logging Queue */
 struct alq {
 	int	aq_entmax;		/* Max entries */

==== //depot/projects/newisp/kern/kern_environment.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.44 2006/07/09 21:42:58 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.45 2006/10/22 11:52:12 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -44,7 +44,6 @@
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
@@ -54,6 +53,8 @@
 #include <sys/libkern.h>
 #include <sys/kenv.h>
 
+#include <security/mac/mac_framework.h>
+
 static MALLOC_DEFINE(M_KENV, "kenv", "kernel environment");
 
 #define KENV_SIZE	512	/* Maximum number of environment strings */

==== //depot/projects/newisp/kern/kern_exec.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.296 2006/10/22 04:28:13 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.298 2006/10/22 21:18:47 alc Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
@@ -39,7 +39,6 @@
 #include <sys/sysproto.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/mount.h>
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
@@ -80,6 +79,7 @@
 #include <machine/reg.h>
 
 #include <security/audit/audit.h>
+#include <security/mac/mac_framework.h>
 
 MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments");
 
@@ -829,9 +829,7 @@
 					break;
 				if ((ma[i]->oflags & VPO_BUSY) || ma[i]->busy)
 					break;
-				vm_page_lock_queues();
 				vm_page_busy(ma[i]);
-				vm_page_unlock_queues();
 			} else {
 				ma[i] = vm_page_alloc(object, i,
 				    VM_ALLOC_NORMAL);
@@ -855,8 +853,8 @@
 	}
 	vm_page_lock_queues();
 	vm_page_hold(ma[0]);
+	vm_page_unlock_queues();
 	vm_page_wakeup(ma[0]);
-	vm_page_unlock_queues();
 	VM_OBJECT_UNLOCK(object);
 
 	imgp->firstpage = sf_buf_alloc(ma[0], 0);

==== //depot/projects/newisp/kern/kern_exit.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.291 2006/10/21 23:59:15 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.292 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
@@ -65,7 +65,6 @@
 #include <sys/ptrace.h>
 #include <sys/acct.h>		/* for acct_process() function prototype */
 #include <sys/filedesc.h>
-#include <sys/mac.h>
 #include <sys/shm.h>
 #include <sys/sem.h>
 #ifdef KTRACE
@@ -73,6 +72,7 @@
 #endif
 
 #include <security/audit/audit.h>
+#include <security/mac/mac_framework.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>

==== //depot/projects/newisp/kern/kern_fork.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.261 2006/08/15 12:10:57 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.262 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
@@ -59,7 +59,6 @@
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 #include <sys/acct.h>
-#include <sys/mac.h>
 #include <sys/ktr.h>
 #include <sys/ktrace.h>
 #include <sys/unistd.h>	
@@ -67,6 +66,7 @@
 #include <sys/signalvar.h>
 
 #include <security/audit/audit.h>
+#include <security/mac/mac_framework.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

==== //depot/projects/newisp/kern/kern_jail.c#3 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.52 2006/09/17 20:00:35 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.53 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -18,7 +18,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/sysproto.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/taskqueue.h>
@@ -35,6 +34,8 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
+#include <security/mac/mac_framework.h>
+
 MALLOC_DEFINE(M_PRISON, "prison", "Prison structures");
 
 SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW, 0,

==== //depot/projects/newisp/kern/kern_ktrace.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.110 2006/07/31 15:31:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.111 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
@@ -44,7 +44,6 @@
 #include <sys/kthread.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
@@ -57,6 +56,8 @@
 #include <sys/syslog.h>
 #include <sys/sysproto.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * The ktrace facility allows the tracing of certain key events in user space
  * processes, such as system calls, signal delivery, context switches, and

==== //depot/projects/newisp/kern/kern_linker.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.142 2006/07/10 19:28:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.143 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
@@ -41,7 +41,6 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>
-#include <sys/mac.h>
 #include <sys/module.h>
 #include <sys/mount.h>
 #include <sys/linker.h>
@@ -52,6 +51,8 @@
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 
+#include <security/mac/mac_framework.h>
+
 #include "linker_if.h"
 
 #ifdef HWPMC_HOOKS

==== //depot/projects/newisp/kern/kern_mac.c#3 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1999-2002 Robert N. M. Watson
  * Copyright (c) 2001 Ilmar S. Habibulin
  * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
- * Copyright (c) 2005 SPARTA, Inc.
+ * Copyright (c) 2005-2006 SPARTA, Inc.
  * All rights reserved.
  *
  * This software was developed by Robert Watson and Ilmar Habibulin for the
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.122 2006/09/20 13:33:40 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.123 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -91,6 +91,7 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>
 
+#include <security/mac/mac_framework.h>
 #include <security/mac/mac_internal.h>
 
 #ifdef MAC

==== //depot/projects/newisp/kern/kern_mbuf.c#3 (text+ko) ====

@@ -26,13 +26,12 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.26 2006/09/17 13:44:32 andre Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.27 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -43,6 +42,8 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 #include <vm/uma.h>

==== //depot/projects/newisp/kern/kern_prot.c#3 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.204 2006/09/17 20:00:35 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.205 2006/10/22 11:52:13 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -51,7 +51,6 @@
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>

>>> TRUNCATED FOR MAIL (1000 lines) <<<