summaryrefslogtreecommitdiffstats
path: root/sys/kern/uipc_sem.c
diff options
context:
space:
mode:
authortrhodes <trhodes@FreeBSD.org>2006-11-11 16:26:58 +0000
committertrhodes <trhodes@FreeBSD.org>2006-11-11 16:26:58 +0000
commit58cca8458a944de5b59a86ec54e14d209a9ec365 (patch)
tree662fae3cb386b3fef99fe533a5744acfbb9353ad /sys/kern/uipc_sem.c
parent2d45fdc2442208a8507360346e65129e7a557b7c (diff)
downloadFreeBSD-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/kern/uipc_sem.c')
-rw-r--r--sys/kern/uipc_sem.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index 340c1a6..0347a51 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -42,14 +42,17 @@ __FBSDID("$FreeBSD$");
#include <sys/sysproto.h>
#include <sys/eventhandler.h>
#include <sys/kernel.h>
+#include <sys/ksem.h>
#include <sys/priv.h>
#include <sys/proc.h>
+#include <sys/posix4.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/module.h>
#include <sys/condvar.h>
#include <sys/sem.h>
#include <sys/uio.h>
+#include <sys/semaphore.h>
#include <sys/syscall.h>
#include <sys/stat.h>
#include <sys/sysent.h>
@@ -57,11 +60,7 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <sys/malloc.h>
#include <sys/fcntl.h>
-
-#include <posix4/ksem.h>
-#include <posix4/posix4.h>
-#include <posix4/semaphore.h>
-#include <posix4/_semaphore.h>
+#include <sys/_semaphore.h>
#include <security/mac/mac_framework.h>
OpenPOWER on IntegriCloud