diff options
| -rw-r--r-- | sys/sys/mbuf.h | 6 | ||||
| -rw-r--r-- | sys/sys/mount.h | 2 | ||||
| -rw-r--r-- | sys/sys/pipe.h | 2 | ||||
| -rw-r--r-- | sys/sys/socketvar.h | 2 | ||||
| -rw-r--r-- | sys/sys/ucred.h | 8 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 2 |
6 files changed, 8 insertions, 14 deletions
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index c41d8fc..e4a3de8 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -37,11 +37,7 @@ #ifndef _SYS_MBUF_H_ #define _SYS_MBUF_H_ -/* - * XXXMAC: Possibly this recursive include is a bad idea, but a lot - * of code exists that assumes it is sufficient to include just mbuf.h - */ -#include <sys/mac.h> +#include <sys/_label.h> /* * Mbufs are of a single size, MSIZE (machine/param.h), which diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 14a1e64..3bdce92 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -43,10 +43,10 @@ */ #include <sys/lockmgr.h> -#include <sys/mac.h> #include <sys/ucred.h> #include <sys/queue.h> #ifdef _KERNEL +#include <sys/_label.h> #include <sys/_lock.h> #include <sys/_mutex.h> #endif diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h index 6b501d6..edbb388 100644 --- a/sys/sys/pipe.h +++ b/sys/sys/pipe.h @@ -28,7 +28,7 @@ #include <sys/time.h> /* for struct timespec */ #include <sys/selinfo.h> /* for struct selinfo */ #include <vm/vm.h> /* for vm_page_t */ -#include <sys/mac.h> /* for struct label */ +#include <sys/_label.h> /* for struct label */ #include <machine/param.h> /* for PAGE_SIZE */ #endif diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 81d7f45..9d0a220 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -37,7 +37,7 @@ #ifndef _SYS_SOCKETVAR_H_ #define _SYS_SOCKETVAR_H_ -#include <sys/mac.h> /* for struct label */ +#include <sys/_label.h> /* for struct label */ #include <sys/queue.h> /* for TAILQ macros */ #include <sys/selinfo.h> /* for struct selinfo */ diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 115fb7b..7a78810 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -38,12 +38,10 @@ #define _SYS_UCRED_H_ /* - * XXXMAC: Recursively include mac.h due to an API assumption that it - * it is sufficient to include types.h and ucred.h to have a defined - * struct ucred. This should be changed so that struct ucred is not - * exported to userland via _KERNEL. + * XXXMAC: this recursive include could be #ifdef _KERNEL if struct + * ucred could also be #ifdef _KERNEL. */ -#include <sys/mac.h> +#include <sys/_label.h> /* * Credentials. diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 6ac9bf2..db76e95 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -44,12 +44,12 @@ #include <sys/lockmgr.h> #include <sys/queue.h> +#include <sys/_label.h> #include <sys/_lock.h> #include <sys/_mutex.h> #include <sys/selinfo.h> #include <sys/uio.h> #include <sys/acl.h> -#include <sys/mac.h> #include <vm/uma.h> /* |
