summaryrefslogtreecommitdiffstats
path: root/sys/sys
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/sys
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/sys')
-rw-r--r--sys/sys/sysproto.h2
-rw-r--r--sys/sys/thr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 00b58bf..c99ce41 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -11,8 +11,8 @@
#include <sys/signal.h>
#include <sys/acl.h>
-#include <posix4/_semaphore.h>
#include <sys/ucontext.h>
+#include <sys/_semaphore.h>
#include <bsm/audit_kevents.h>
diff --git a/sys/sys/thr.h b/sys/sys/thr.h
index 216ef6f..bcf1ef9 100644
--- a/sys/sys/thr.h
+++ b/sys/sys/thr.h
@@ -30,7 +30,7 @@
#ifndef _SYS_THR_H_
#define _SYS_THR_H_
-#include <posix4/sched.h>
+#include <sys/sched.h>
/* Create the thread in the suspended state. */
#define THR_SUSPENDED 0x0001
OpenPOWER on IntegriCloud