Date: Thu, 6 Jul 2006 11:06:22 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100720 for review Message-ID: <200607061106.k66B6M88065339@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100720 Change 100720 by rwatson@rwatson_zoo on 2006/07/06 11:06:15 Update include files; in most cases, mac.h -> mac_framework.h, except in kern_mac.c. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_stats.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/unionfs/union_vnops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/i386/i386/sys_machdep.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_alq.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mbuf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_shutdown.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sysctl.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf_obj.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/subr_trap.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sys_pipe.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_shm.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf2.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_mount.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_vnops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/bsd_comp.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_atmsubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_fddisubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_fwsubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_iso88025subr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include <sys/file.h> #include <sys/filedesc.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ #include <sys/mount.h> #include <sys/proc.h> #include <sys/uio.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/dirent.h> #include <ufs/ufs/dir.h> /* XXX only for DIRBLKSIZ */ ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include <sys/kernel.h> #include <sys/limits.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mman.h> #include <sys/mount.h> ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include <sys/filedesc.h> #include <sys/proc.h> #include <sys/jail.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include <sys/filedesc.h> /*#include <sys/ioctl.h>*/ #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include <sys/imgact.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/file.h> /* Must come after sys/malloc.h */ #include <sys/mman.h> ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#2 (text+ko) ==== @@ -50,7 +50,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/file.h> /* Must come after sys/malloc.h */ -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mbuf.h> #include <sys/mutex.h> #include <sys/proc.h> ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include <sys/kernel.h> #include <sys/limits.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/sx.h> ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#2 (text+ko) ==== @@ -40,8 +40,8 @@ * mkdir: want it ? */ -#include <opt_devfs.h> -#include <opt_mac.h> +#include "opt_devfs.h" +#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> @@ -53,7 +53,7 @@ #include <sys/filio.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> ==== //depot/projects/trustedbsd/mac2/sys/fs/unionfs/union_vnops.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ #include <sys/acl.h> #include <sys/event.h> #include <sys/extattr.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> /* XXXRW: Why is this needed? */ #include <fs/unionfs/union.h> #include <vm/vm.h> ==== //depot/projects/trustedbsd/mac2/sys/i386/i386/sys_machdep.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/proc.h> ==== //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ #include <sys/imgact.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/file.h> /* Must come after sys/malloc.h */ #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ #include <sys/filedesc.h> #include <sys/ktr.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mount.h> #include <sys/mutex.h> #include <sys/syscallsubr.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ #include <sys/kernel.h> #include <sys/kthread.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mount.h> #include <sys/mutex.h> #include <sys/namei.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/vnode.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_alq.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #include <sys/kernel.h> #include <sys/kthread.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mount.h> #include <sys/mutex.h> #include <sys/namei.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include <sys/proc.h> #include <sys/queue.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/kernel.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include <sys/sysproto.h> #include <sys/signalvar.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mount.h> #include <sys/filedesc.h> #include <sys/fcntl.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ #include <sys/ptrace.h> #include <sys/acct.h> /* for acct_process() function prototype */ #include <sys/filedesc.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/shm.h> #include <sys/sem.h> #ifdef KTRACE ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include <sys/vmmeter.h> #include <sys/vnode.h> #include <sys/acct.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/ktr.h> #include <sys/ktrace.h> #include <sys/unistd.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ #include <sys/systm.h> #include <sys/errno.h> #include <sys/sysproto.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/taskqueue.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include <sys/kthread.h> #include <sys/lock.h> #include <sys/mutex.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include <sys/lock.h> #include <sys/mutex.h> #include <sys/sx.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/module.h> #include <sys/mount.h> #include <sys/linker.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#2 (text+ko) ==== @@ -61,6 +61,7 @@ #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/module.h> #include <sys/proc.h> #include <sys/sbuf.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mbuf.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_param.h" #include <sys/param.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/systm.h> #include <sys/mbuf.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ #include <sys/kdb.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/refcount.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_shutdown.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ #include <sys/kdb.h> #include <sys/kernel.h> #include <sys/kthread.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_sysctl.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/lock.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include <sys/resourcevar.h> #include <sys/signalvar.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/syscallsubr.h> #include <sys/sysctl.h> #include <sys/sysent.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/mount.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/link_elf_obj.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/mount.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/subr_trap.c#2 (text+ko) ==== @@ -50,7 +50,7 @@ #include <sys/bus.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mutex.h> #include <sys/proc.h> #include <sys/ktr.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/sys_pipe.c#2 (text+ko) ==== @@ -101,7 +101,7 @@ #include <sys/filio.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mutex.h> #include <sys/ttycom.h> #include <sys/stat.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include <sys/systm.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/proc.h> #include <sys/protosw.h> #include <sys/sigio.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mutex.h> #include <sys/module.h> #include <sys/msg.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include <sys/uio.h> #include <sys/malloc.h> #include <sys/jail.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> static MALLOC_DEFINE(M_SEM, "sem", "SVID compatible semaphores"); ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_shm.c#2 (text+ko) ==== @@ -84,7 +84,7 @@ #include <sys/sysent.h> #include <sys/sysproto.h> #include <sys/jail.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <vm/vm.h> #include <vm/vm_param.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include <sys/kernel.h> #include <sys/limits.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/sysctl.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf2.c#2 (text+ko) ==== @@ -71,7 +71,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ #include <sys/sysent.h> #include <sys/sysctl.h> #include <sys/time.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/fcntl.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#2 (text+ko) ==== @@ -101,7 +101,7 @@ #include <sys/fcntl.h> #include <sys/limits.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include <sys/file.h> /* for maxfiles */ #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mutex.h> #include <sys/sysproto.h> #include <sys/malloc.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include <sys/jail.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mbuf.h> #include <sys/mount.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mutex.h> #include <sys/namei.h> #include <sys/vnode.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_mount.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include <sys/jail.h> #include <sys/kernel.h> #include <sys/libkern.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#2 (text+ko) ==== @@ -58,7 +58,7 @@ #include <sys/kdb.h> #include <sys/kernel.h> #include <sys/kthread.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include <sys/bio.h> #include <sys/buf.h> #include <sys/sysent.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_vnops.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include <sys/proc.h> #include <sys/limits.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mount.h> #include <sys/mutex.h> #include <sys/namei.h> ==== //depot/projects/trustedbsd/mac2/sys/net/bpf.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include <sys/systm.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/time.h> ==== //depot/projects/trustedbsd/mac2/sys/net/bsd_comp.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/mutex.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include <sys/param.h> #include <sys/types.h> #include <sys/conf.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/sbuf.h> #include <sys/bus.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_atmsubr.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/module.h> #include <sys/mbuf.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_fddisubr.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_fwsubr.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_iso88025subr.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/filio.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mbuf.h> #include <sys/errno.h> #include <sys/kernel.h> ==== //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ #include <sys/param.h> #include <sys/proc.h> #include <sys/systm.h> -#include <sys/mac.h> +#include <sys/mac_framework.h> #include <sys/mbuf.h> #include <sys/module.h> #include <sys/socket.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607061106.k66B6M88065339>