diff options
| author | trhodes <trhodes@FreeBSD.org> | 2006-11-11 16:26:58 +0000 |
|---|---|---|
| committer | trhodes <trhodes@FreeBSD.org> | 2006-11-11 16:26:58 +0000 |
| commit | 58cca8458a944de5b59a86ec54e14d209a9ec365 (patch) | |
| tree | 662fae3cb386b3fef99fe533a5744acfbb9353ad /sys/security | |
| parent | 2d45fdc2442208a8507360346e65129e7a557b7c (diff) | |
| download | FreeBSD-src-58cca8458a944de5b59a86ec54e14d209a9ec365.zip FreeBSD-src-58cca8458a944de5b59a86ec54e14d209a9ec365.tar.gz | |
Merge posix4/* into normal kernel hierarchy.
Reviewed by: glanced at by jhb
Approved by: silence on -arch@ and -standards@
Diffstat (limited to 'sys/security')
| -rw-r--r-- | sys/security/mac/mac_posix_sem.c | 3 | ||||
| -rw-r--r-- | sys/security/mac_biba/mac_biba.c | 3 | ||||
| -rw-r--r-- | sys/security/mac_mls/mac_mls.c | 3 | ||||
| -rw-r--r-- | sys/security/mac_stub/mac_stub.c | 3 | ||||
| -rw-r--r-- | sys/security/mac_test/mac_test.c | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/sys/security/mac/mac_posix_sem.c b/sys/security/mac/mac_posix_sem.c index e852779..5e3941f 100644 --- a/sys/security/mac/mac_posix_sem.c +++ b/sys/security/mac/mac_posix_sem.c @@ -37,14 +37,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> +#include <sys/ksem.h> #include <sys/malloc.h> #include <sys/mac.h> #include <sys/module.h> #include <sys/systm.h> #include <sys/sysctl.h> -#include <posix4/ksem.h> - #include <sys/mac_policy.h> #include <security/mac/mac_framework.h> diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 3f244ae..cfafc6c 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -45,6 +45,7 @@ #include <sys/conf.h> #include <sys/extattr.h> #include <sys/kernel.h> +#include <sys/ksem.h> #include <sys/mac.h> #include <sys/malloc.h> #include <sys/mman.h> @@ -66,8 +67,6 @@ #include <sys/sem.h> #include <sys/shm.h> -#include <posix4/ksem.h> - #include <fs/devfs/devfs.h> #include <net/bpfdesc.h> diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c index 2361abc..d02f034 100644 --- a/sys/security/mac_mls/mac_mls.c +++ b/sys/security/mac_mls/mac_mls.c @@ -45,6 +45,7 @@ #include <sys/conf.h> #include <sys/extattr.h> #include <sys/kernel.h> +#include <sys/ksem.h> #include <sys/mac.h> #include <sys/mman.h> #include <sys/malloc.h> @@ -66,8 +67,6 @@ #include <sys/sem.h> #include <sys/shm.h> -#include <posix4/ksem.h> - #include <fs/devfs/devfs.h> #include <net/bpfdesc.h> diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c index a9c3b85..dee29e3 100644 --- a/sys/security/mac_stub/mac_stub.c +++ b/sys/security/mac_stub/mac_stub.c @@ -51,6 +51,7 @@ #include <sys/conf.h> #include <sys/extattr.h> #include <sys/kernel.h> +#include <sys/ksem.h> #include <sys/mac.h> #include <sys/mount.h> #include <sys/proc.h> @@ -68,8 +69,6 @@ #include <sys/sem.h> #include <sys/shm.h> -#include <posix4/ksem.h> - #include <fs/devfs/devfs.h> #include <net/bpfdesc.h> diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c index 921e641..d968ec9 100644 --- a/sys/security/mac_test/mac_test.c +++ b/sys/security/mac_test/mac_test.c @@ -46,6 +46,7 @@ #include <sys/kdb.h> #include <sys/extattr.h> #include <sys/kernel.h> +#include <sys/ksem.h> #include <sys/mac.h> #include <sys/malloc.h> #include <sys/mount.h> @@ -63,8 +64,6 @@ #include <sys/sem.h> #include <sys/shm.h> -#include <posix4/ksem.h> - #include <fs/devfs/devfs.h> #include <net/bpfdesc.h> |
