From owner-freebsd-standards@FreeBSD.ORG  Tue Nov  7 14:11:43 2006
Return-Path: <owner-freebsd-standards@FreeBSD.ORG>
X-Original-To: standards@FreeBSD.org
Delivered-To: freebsd-standards@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DA90716A403;
	Tue,  7 Nov 2006 14:11:42 +0000 (UTC)
	(envelope-from trhodes@FreeBSD.org)
Received: from pittgoth.com (ns1.pittgoth.com [216.38.206.188])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B9C6243D88;
	Tue,  7 Nov 2006 14:11:40 +0000 (GMT)
	(envelope-from trhodes@FreeBSD.org)
Received: from localhost (ip70-177-190-239.dc.dc.cox.net [70.177.190.239])
	(authenticated bits=0)
	by pittgoth.com (8.13.6/8.13.6) with ESMTP id kA7EBcgm069394
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Tue, 7 Nov 2006 09:11:39 -0500 (EST)
	(envelope-from trhodes@FreeBSD.org)
Date: Tue, 7 Nov 2006 09:11:28 -0500
From: Tom Rhodes <trhodes@FreeBSD.org>
To: standards@FreeBSD.org
Message-Id: <20061107091128.063d0ae5.trhodes@FreeBSD.org>
Organization: The FreeBSD Project
X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd7.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: arch@FreeBSD.org
Subject: cvs rm sys/posix4  && enable sem
X-BeenThere: freebsd-standards@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Standards compliance <freebsd-standards.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-standards>, 
	<mailto:freebsd-standards-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-standards>
List-Post: <mailto:freebsd-standards@freebsd.org>
List-Help: <mailto:freebsd-standards-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-standards>, 
	<mailto:freebsd-standards-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Nov 2006 14:11:43 -0000

Hi,

I spent some time this morning working over the P1003_1B_SEMAPHORES
option and figured I might as well play with the task of merging
posix4/ into regular sys.  In light of of this, I also enabled and
tested on all architectures, the sem module disabled by Alfred
for some unknown (later learned via old email) reason.

Does anyone object to the following:

1: Repocopy posix4/* files to sys/sys and sys/kern;
2: patch CURRENT for the change;
3: remove posix4/*;
4: enable sem module;
5: add P1003_1B_SEMAPHORES to GENERIC;
6: (eventually and maybe) merge psched.h and sched.h (I renamed
   posix4/sched.h to sys/psched.h in this patch).  This one is
   completely optional.

The included patch is pretty vanilla and does *most* of this,
not counting the repo-copy and added P1003_1B_SEMAPHORES to
GENERIC.  It also passes my universe build.  This also has the
side effect of differentiating between the two sched.h files we
have in the tree.  Thanks,

-- 
Tom Rhodes


Index: include/Makefile
===================================================================
RCS file: /home/ncvs/src/include/Makefile,v
retrieving revision 1.265
diff -u -r1.265 Makefile
--- include/Makefile	31 Oct 2006 22:22:29 -0000	1.265
+++ include/Makefile	7 Nov 2006 13:48:11 -0000
@@ -28,7 +28,7 @@
 
 MHDRS=	float.h floatingpoint.h stdarg.h
 
-PHDRS=	sched.h semaphore.h _semaphore.h
+PHDRS=	psched.h semaphore.h _semaphore.h
 
 LHDRS=	aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
 	termios.h ucontext.h
@@ -36,7 +36,7 @@
 LDIRS=	bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \
 	netipsec ${_netipx} netkey netnatm ${_netncp} netsmb \
 	nfs nfsclient nfsserver \
-	pccard posix4 sys vm
+	pccard sys vm
 
 LSUBDIRS=	cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
@@ -111,7 +111,7 @@
 INCSLINKS+=	machine/$i ${INCLUDEDIR}/$i
 .endfor
 .for i in ${PHDRS}
-INCSLINKS+=	posix4/$i ${INCLUDEDIR}/$i
+INCSLINKS+=	sys/$i ${INCLUDEDIR}/$i
 .endfor
 
 .if ${MACHINE} != ${MACHINE_ARCH}
Index: include/pthread.h
===================================================================
RCS file: /home/ncvs/src/include/pthread.h,v
retrieving revision 1.40
diff -u -r1.40 pthread.h
--- include/pthread.h	24 Oct 2005 05:53:54 -0000	1.40
+++ include/pthread.h	7 Nov 2006 13:48:11 -0000
@@ -43,7 +43,7 @@
 #include <machine/_limits.h>
 #include <machine/_types.h>
 #include <sys/_sigset.h>
-#include <sched.h>
+#include <psched.h>
 #include <time.h>
 
 /*
Index: lib/libc/stdlib/malloc.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/stdlib/malloc.c,v
retrieving revision 1.137
diff -u -r1.137 malloc.c
--- lib/libc/stdlib/malloc.c	8 Sep 2006 17:52:15 -0000	1.137
+++ lib/libc/stdlib/malloc.c	7 Nov 2006 13:48:13 -0000
@@ -210,7 +210,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <pthread.h>
-#include <sched.h>
+#include <psched.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
Index: lib/libc/sys/sched_get_priority_max.2
===================================================================
RCS file: /home/ncvs/src/lib/libc/sys/sched_get_priority_max.2,v
retrieving revision 1.19
diff -u -r1.19 sched_get_priority_max.2
--- lib/libc/sys/sched_get_priority_max.2	2 Jul 2004 23:52:13 -0000	1.19
+++ lib/libc/sys/sched_get_priority_max.2	7 Nov 2006 13:48:13 -0000
@@ -35,7 +35,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sched.h
+.In psched.h
 .Ft int
 .Fn sched_get_priority_max "int policy"
 .Ft int
@@ -67,7 +67,7 @@
 The value of
 .Fa policy
 should be one of the scheduling policy values defined in
-.Fa <sched.h> :
+.Fa <psched.h> :
 .Bl -tag -width [SCHED_OTHER]
 .It Bq Er SCHED_FIFO
 First-in-first-out fixed priority scheduling with no round robin scheduling;
Index: lib/libc/sys/sched_setparam.2
===================================================================
RCS file: /home/ncvs/src/lib/libc/sys/sched_setparam.2,v
retrieving revision 1.17
diff -u -r1.17 sched_setparam.2
--- lib/libc/sys/sched_setparam.2	4 Jul 2004 20:55:48 -0000	1.17
+++ lib/libc/sys/sched_setparam.2	7 Nov 2006 13:48:13 -0000
@@ -33,7 +33,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sched.h
+.In psched.h
 .Ft int
 .Fn sched_setparam "pid_t pid" "const struct sched_param *param"
 .Ft int
Index: lib/libc/sys/sched_setscheduler.2
===================================================================
RCS file: /home/ncvs/src/lib/libc/sys/sched_setscheduler.2,v
retrieving revision 1.17
diff -u -r1.17 sched_setscheduler.2
--- lib/libc/sys/sched_setscheduler.2	2 Jul 2004 23:52:13 -0000	1.17
+++ lib/libc/sys/sched_setscheduler.2	7 Nov 2006 13:48:13 -0000
@@ -33,7 +33,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sched.h
+.In psched.h
 .Ft int
 .Fn sched_setscheduler "pid_t pid" "int policy" "const struct sched_param *param"
 .Ft int
@@ -81,7 +81,7 @@
 as a write-style operation.
 .Pp
 The scheduling policies are in
-.Fa <sched.h> :
+.Fa <psched.h> :
 .Bl -tag -width [SCHED_OTHER]
 .It Bq Er SCHED_FIFO
 First-in-first-out fixed priority scheduling with no round robin scheduling;
@@ -94,7 +94,7 @@
 The
 .Vt sched_param
 structure is defined in
-.Fa <sched.h> :
+.Fa <psched.h> :
 .Pp
 .Bd -literal -offset indent
 struct sched_param {
Index: lib/libc/sys/sched_yield.2
===================================================================
RCS file: /home/ncvs/src/lib/libc/sys/sched_yield.2,v
retrieving revision 1.13
diff -u -r1.13 sched_yield.2
--- lib/libc/sys/sched_yield.2	2 Jul 2004 23:52:13 -0000	1.13
+++ lib/libc/sys/sched_yield.2	7 Nov 2006 13:48:13 -0000
@@ -32,7 +32,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In sched.h
+.In psched.h
 .Ft int
 .Fn sched_yield void
 .Sh DESCRIPTION
Index: lib/libc_r/test/mutex_d.c
===================================================================
RCS file: /home/ncvs/src/lib/libc_r/test/mutex_d.c,v
retrieving revision 1.4
diff -u -r1.4 mutex_d.c
--- lib/libc_r/test/mutex_d.c	4 Jun 2003 20:38:54 -0000	1.4
+++ lib/libc_r/test/mutex_d.c	7 Nov 2006 13:48:13 -0000
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include "pthread.h"
-#include <sched.h>
+#include <psched.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
Index: lib/libc_r/uthread/pthread_private.h
===================================================================
RCS file: /home/ncvs/src/lib/libc_r/uthread/pthread_private.h,v
retrieving revision 1.87
diff -u -r1.87 pthread_private.h
--- lib/libc_r/uthread/pthread_private.h	31 May 2005 19:57:23 -0000	1.87
+++ lib/libc_r/uthread/pthread_private.h	7 Nov 2006 13:48:13 -0000
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/cdefs.h>
-#include <sched.h>
+#include <psched.h>
 #include <spinlock.h>
 #include <ucontext.h>
 #include <pthread_np.h>
Index: lib/libc_r/uthread/uthread_spinlock.c
===================================================================
RCS file: /home/ncvs/src/lib/libc_r/uthread/uthread_spinlock.c,v
retrieving revision 1.12
diff -u -r1.12 uthread_spinlock.c
--- lib/libc_r/uthread/uthread_spinlock.c	26 Mar 2003 04:02:24 -0000	1.12
+++ lib/libc_r/uthread/uthread_spinlock.c	7 Nov 2006 13:48:13 -0000
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <sched.h>
+#include <psched.h>
 #include <pthread.h>
 #include <unistd.h>
 
Index: lib/libpthread/test/mutex_d.c
===================================================================
RCS file: /home/ncvs/src/lib/libpthread/test/mutex_d.c,v
retrieving revision 1.5
diff -u -r1.5 mutex_d.c
--- lib/libpthread/test/mutex_d.c	19 Nov 2005 04:47:06 -0000	1.5
+++ lib/libpthread/test/mutex_d.c	7 Nov 2006 13:48:15 -0000
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
-#include <sched.h>
+#include <psched.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
Index: lib/libpthread/thread/thr_private.h
===================================================================
RCS file: /home/ncvs/src/lib/libpthread/thread/thr_private.h,v
retrieving revision 1.127
diff -u -r1.127 thr_private.h
--- lib/libpthread/thread/thr_private.h	9 Jun 2006 14:23:40 -0000	1.127
+++ lib/libpthread/thread/thr_private.h	7 Nov 2006 13:48:15 -0000
@@ -48,7 +48,7 @@
 #include <sys/time.h>
 #include <sys/cdefs.h>
 #include <sys/kse.h>
-#include <sched.h>
+#include <psched.h>
 #include <ucontext.h>
 #include <unistd.h>
 #include <pthread.h>
@@ -1257,7 +1257,7 @@
 int	__sys_ioctl(int, unsigned long, ...);
 #endif
 
-/* #inclde <sched.h> */
+/* #inclde <psched.h> */
 #ifdef	_SCHED_H_
 int	__sys_sched_yield(void);
 #endif
Index: lib/libthr/thread/thr_yield.c
===================================================================
RCS file: /home/ncvs/src/lib/libthr/thread/thr_yield.c,v
retrieving revision 1.2
diff -u -r1.2 thr_yield.c
--- lib/libthr/thread/thr_yield.c	4 Apr 2006 02:57:49 -0000	1.2
+++ lib/libthr/thread/thr_yield.c	7 Nov 2006 13:48:40 -0000
@@ -34,7 +34,7 @@
 
 #include "namespace.h"
 #include <pthread.h>
-#include <sched.h>
+#include <psched.h>
 #include "un-namespace.h"
 
 __weak_reference(_pthread_yield, pthread_yield);
Index: share/man/man4/sem.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/sem.4,v
retrieving revision 1.2
diff -u -r1.2 sem.4
--- share/man/man4/sem.4	2 Jun 2003 11:19:23 -0000	1.2
+++ share/man/man4/sem.4	7 Nov 2006 13:48:49 -0000
@@ -24,19 +24,26 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/sem.4,v 1.2 2003/06/02 11:19:23 ru Exp $
 .\"
-.Dd January 14, 2003
+.Dd November 6, 2006
 .Dt SEM 4
 .Os
 .Sh NAME
 .Nm sem
 .Nd POSIX semaphores
 .Sh SYNOPSIS
-To link into the kernel:
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "options P1003_1B_SEMAPHORES"
 .Ed
 .Pp
-To load as a kernel loadable module:
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+sem_load="YES"
+.Ed
 .Pp
 .Dl "kldload sem"
 .Sh DESCRIPTION
@@ -47,6 +54,10 @@
 to implement
 .Tn POSIX
 semaphores.
+This facility offers support for such functions as
+.Fn sem_init
+and
+.Fn sem_wait .
 It is available both as a kernel option for static inclusion and as a
 dynamic kernel module.
 .Sh SEE ALSO
@@ -68,3 +79,4 @@
 .Nm
 kernel module appeared in
 .Fx 5.0 .
+.\" XXX: This manual page is weak with details and info.
Index: sys/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- sys/Makefile	10 Aug 2006 06:29:43 -0000	1.38
+++ sys/Makefile	7 Nov 2006 13:48:49 -0000
@@ -11,7 +11,7 @@
 CSCOPEDIRS=	coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \
 		isofs kern libkern modules net net80211 netatalk netatm \
 		netgraph netinet netinet6 netipx netkey netnatm netncp \
-		netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \
+		netsmb nfs nfsclient nfs4client rpc pccard pci sys \
 		ufs vm ${ARCHDIR}
 
 ARCHDIR	?=	${MACHINE}
Index: sys/amd64/linux32/linux32_proto.h
===================================================================
RCS file: /home/ncvs/src/sys/amd64/linux32/linux32_proto.h,v
retrieving revision 1.25
diff -u -r1.25 linux32_proto.h
--- sys/amd64/linux32/linux32_proto.h	29 Oct 2006 14:12:44 -0000	1.25
+++ sys/amd64/linux32/linux32_proto.h	7 Nov 2006 13:48:50 -0000
@@ -11,7 +11,7 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <posix4/_semaphore.h>
+#include <sys/_semaphore.h>
 #include <sys/ucontext.h>
 
 #include <bsm/audit_kevents.h>
Index: sys/compat/freebsd32/freebsd32_proto.h
===================================================================
RCS file: /home/ncvs/src/sys/compat/freebsd32/freebsd32_proto.h,v
retrieving revision 1.74
diff -u -r1.74 freebsd32_proto.h
--- sys/compat/freebsd32/freebsd32_proto.h	3 Nov 2006 21:23:33 -0000	1.74
+++ sys/compat/freebsd32/freebsd32_proto.h	7 Nov 2006 13:48:51 -0000
@@ -11,7 +11,7 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <posix4/_semaphore.h>
+#include <sys/_semaphore.h>
 #include <sys/ucontext.h>
 
 #include <bsm/audit_kevents.h>
Index: sys/compat/linux/linux_misc.c
===================================================================
RCS file: /home/ncvs/src/sys/compat/linux/linux_misc.c,v
retrieving revision 1.191
diff -u -r1.191 linux_misc.c
--- sys/compat/linux/linux_misc.c	28 Oct 2006 16:47:38 -0000	1.191
+++ sys/compat/linux/linux_misc.c	7 Nov 2006 13:48:51 -0000
@@ -72,7 +72,7 @@
 #include <vm/vm_object.h>
 #include <vm/swap_pager.h>
 
-#include <posix4/sched.h>
+#include <sys/psched.h>
 
 #include <compat/linux/linux_sysproto.h>
 #include <compat/linux/linux_emul.h>
Index: sys/compat/svr4/svr4_proto.h
===================================================================
RCS file: /home/ncvs/src/sys/compat/svr4/svr4_proto.h,v
retrieving revision 1.27
diff -u -r1.27 svr4_proto.h
--- sys/compat/svr4/svr4_proto.h	15 Aug 2006 17:36:59 -0000	1.27
+++ sys/compat/svr4/svr4_proto.h	7 Nov 2006 13:48:51 -0000
@@ -11,7 +11,7 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <posix4/_semaphore.h>
+#include <sys/_semaphore.h>
 #include <sys/ucontext.h>
 
 #include <bsm/audit_kevents.h>
Index: sys/conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.1159
diff -u -r1.1159 files
--- sys/conf/files	3 Nov 2006 21:09:03 -0000	1.1159
+++ sys/conf/files	7 Nov 2006 13:48:52 -0000
@@ -1315,6 +1315,7 @@
 kern/inflate.c			optional gzip
 kern/init_main.c		standard
 kern/init_sysent.c		standard
+kern/ksched.c			optional _kposix_priority_scheduling
 kern/kern_acct.c		standard
 kern/kern_acl.c			standard
 kern/kern_alq.c			optional alq
@@ -1374,6 +1375,8 @@
 kern/linker_if.m		standard
 kern/md4c.c			optional netsmb
 kern/md5c.c			standard
+kern/p1003_1b.c			standard
+kern/posix4_mib.c		standard
 kern/sched_4bsd.c		optional sched_4bsd
 kern/sched_core.c		optional sched_core
 kern/sched_ule.c		optional sched_ule
@@ -1918,9 +1921,6 @@
 pci/nfsmb.c			optional nfsmb pci
 pci/viapm.c			optional viapm pci
 pci/xrpu.c			optional xrpu pci
-posix4/ksched.c			optional _kposix_priority_scheduling
-posix4/p1003_1b.c		standard
-posix4/posix4_mib.c		standard
 rpc/rpcclnt.c			optional nfsclient
 security/audit/audit.c		optional audit
 security/audit/audit_arg.c	optional audit
Index: sys/i386/ibcs2/ibcs2_proto.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/ibcs2/ibcs2_proto.h,v
retrieving revision 1.30
diff -u -r1.30 ibcs2_proto.h
--- sys/i386/ibcs2/ibcs2_proto.h	15 Aug 2006 17:37:00 -0000	1.30
+++ sys/i386/ibcs2/ibcs2_proto.h	7 Nov 2006 13:49:01 -0000
@@ -11,7 +11,7 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <posix4/_semaphore.h>
+#include <sys/_semaphore.h>
 #include <sys/ucontext.h>
 
 #include <bsm/audit_kevents.h>
Index: sys/i386/ibcs2/ibcs2_xenix.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/ibcs2/ibcs2_xenix.h,v
retrieving revision 1.21
diff -u -r1.21 ibcs2_xenix.h
--- sys/i386/ibcs2/ibcs2_xenix.h	15 Aug 2006 17:37:00 -0000	1.21
+++ sys/i386/ibcs2/ibcs2_xenix.h	7 Nov 2006 13:49:01 -0000
@@ -11,7 +11,7 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <posix4/_semaphore.h>
+#include <sys/_semaphore.h>
 #include <sys/ucontext.h>
 
 #include <bsm/audit_kevents.h>
Index: sys/i386/linux/linux_proto.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/linux/linux_proto.h,v
retrieving revision 1.86
diff -u -r1.86 linux_proto.h
--- sys/i386/linux/linux_proto.h	29 Oct 2006 14:12:44 -0000	1.86
+++ sys/i386/linux/linux_proto.h	7 Nov 2006 13:49:01 -0000
@@ -11,7 +11,7 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <posix4/_semaphore.h>
+#include <sys/_semaphore.h>
 #include <sys/ucontext.h>
 
 #include <bsm/audit_kevents.h>
Index: sys/kern/Make.tags.inc
===================================================================
RCS file: /home/ncvs/src/sys/kern/Make.tags.inc,v
retrieving revision 1.15
diff -u -r1.15 Make.tags.inc
--- sys/kern/Make.tags.inc	5 Mar 2003 19:24:21 -0000	1.15
+++ sys/kern/Make.tags.inc	7 Nov 2006 13:49:01 -0000
@@ -47,7 +47,6 @@
 	${SYS}/netnatm/*.[ch] \
 	${SYS}/nfs/*.[ch] \
 	${SYS}/pci/*.[ch] \
-	${SYS}/posix4/*.[ch] \
 	${SYS}/ufs/ffs/*.[ch] \
 	${SYS}/ufs/ufs/*.[ch] \
 	${SYS}/vm/*.[ch] \
@@ -64,7 +63,6 @@
 	${SYS}/netnatm \
 	${SYS}/nfs \
 	${SYS}/pci \
-	${SYS}/posix4 \
 	${SYS}/vm \
 	${SYS}/sys
 
Index: sys/kern/kern_sig.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/kern_sig.c,v
retrieving revision 1.335
diff -u -r1.335 kern_sig.c
--- sys/kern/kern_sig.c	26 Oct 2006 21:42:19 -0000	1.335
+++ sys/kern/kern_sig.c	7 Nov 2006 13:49:01 -0000
@@ -56,6 +56,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
+#include <sys/posix4.h>
 #include <sys/proc.h>
 #include <sys/pioctl.h>
 #include <sys/resourcevar.h>
@@ -76,7 +77,6 @@
 #include <vm/vm_extern.h>
 #include <vm/uma.h>
 
-#include <posix4/posix4.h>
 #include <machine/cpu.h>
 
 #include <security/audit/audit.h>
Index: sys/kern/kern_thr.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/kern_thr.c,v
retrieving revision 1.54
diff -u -r1.54 kern_thr.c
--- sys/kern/kern_thr.c	26 Oct 2006 21:42:20 -0000	1.54
+++ sys/kern/kern_thr.c	7 Nov 2006 13:49:01 -0000
@@ -33,7 +33,9 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/posix4.h>
 #include <sys/proc.h>
+#include <sys/psched.h>
 #include <sys/resourcevar.h>
 #include <sys/sched.h>
 #include <sys/sysctl.h>
@@ -45,8 +47,6 @@
 #include <sys/ucontext.h>
 #include <sys/thr.h>
 #include <sys/rtprio.h>
-#include <posix4/sched.h>
-#include <posix4/posix4.h>
 #include <sys/umtx.h>
 #include <sys/limits.h>
 
Index: sys/kern/kern_time.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/kern_time.c,v
retrieving revision 1.134
diff -u -r1.134 kern_time.c
--- sys/kern/kern_time.c	22 Oct 2006 11:52:13 -0000	1.134
+++ sys/kern/kern_time.c	7 Nov 2006 13:49:01 -0000
@@ -48,14 +48,13 @@
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
+#include <sys/posix4.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/timers.h>
 #include <sys/timetc.h>
 #include <sys/vnode.h>
 
-#include <posix4/posix4.h>
-
 #include <security/mac/mac_framework.h>
 
 #include <vm/vm.h>
Index: sys/kern/makesyscalls.sh
===================================================================
RCS file: /home/ncvs/src/sys/kern/makesyscalls.sh,v
retrieving revision 1.66
diff -u -r1.66 makesyscalls.sh
--- sys/kern/makesyscalls.sh	15 Aug 2006 17:09:32 -0000	1.66
+++ sys/kern/makesyscalls.sh	7 Nov 2006 13:49:01 -0000
@@ -125,7 +125,7 @@
 		printf "#define\t%s\n\n", sysproto_h > sysarg
 		printf "#include <sys/signal.h>\n" > sysarg
 		printf "#include <sys/acl.h>\n" > sysarg
-		printf "#include <posix4/_semaphore.h>\n" > sysarg
+		printf "#include <sys/_semaphore.h>\n" > sysarg
 		printf "#include <sys/ucontext.h>\n\n" > sysarg
 		printf "#include <bsm/audit_kevents.h>\n\n" > sysarg
 		printf "struct proc;\n\n" > sysarg
Index: sys/kern/uipc_mqueue.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mqueue.c,v
retrieving revision 1.16
diff -u -r1.16 uipc_mqueue.c
--- sys/kern/uipc_mqueue.c	26 Sep 2006 04:12:47 -0000	1.16
+++ sys/kern/uipc_mqueue.c	7 Nov 2006 13:49:01 -0000
@@ -65,6 +65,7 @@
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/poll.h>
+#include <sys/posix4.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/sysproto.h>
@@ -78,7 +79,6 @@
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 #include <machine/atomic.h>
-#include <posix4/posix4.h>
 
 /*
  * Limits and constants
Index: sys/kern/uipc_sem.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_sem.c,v
retrieving revision 1.25
diff -u -r1.25 uipc_sem.c
--- sys/kern/uipc_sem.c	22 Oct 2006 11:52:13 -0000	1.25
+++ sys/kern/uipc_sem.c	7 Nov 2006 13:49:01 -0000
@@ -42,6 +42,8 @@
 #include <sys/sysproto.h>
 #include <sys/eventhandler.h>
 #include <sys/kernel.h>
+#include <sys/ksem.h>
+#include <sys/posix4.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -49,6 +51,7 @@
 #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>
@@ -56,11 +59,7 @@
 #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>
 
Index: sys/kern/vfs_aio.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/vfs_aio.c,v
retrieving revision 1.228
diff -u -r1.228 vfs_aio.c
--- sys/kern/vfs_aio.c	15 Oct 2006 14:22:13 -0000	1.228
+++ sys/kern/vfs_aio.c	7 Nov 2006 13:49:12 -0000
@@ -38,6 +38,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/unistd.h>
+#include <sys/posix4.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
@@ -57,7 +58,6 @@
 
 #include <machine/atomic.h>
 
-#include <posix4/posix4.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
Index: sys/modules/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/Makefile,v
retrieving revision 1.510
diff -u -r1.510 Makefile
--- sys/modules/Makefile	9 Sep 2006 16:58:22 -0000	1.510
+++ sys/modules/Makefile	7 Nov 2006 13:49:12 -0000
@@ -219,6 +219,7 @@
 	scc \
 	scd \
 	${_scsi_low} \
+	sem \
 	sf \
 	${_sio} \
 	sis \
Index: sys/security/mac/mac_posix_sem.c
===================================================================
RCS file: /home/ncvs/src/sys/security/mac/mac_posix_sem.c,v
retrieving revision 1.3
diff -u -r1.3 mac_posix_sem.c
--- sys/security/mac/mac_posix_sem.c	22 Oct 2006 11:52:18 -0000	1.3
+++ sys/security/mac/mac_posix_sem.c	7 Nov 2006 13:49:21 -0000
@@ -37,14 +37,13 @@
 
 #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>
Index: sys/security/mac_biba/mac_biba.c
===================================================================
RCS file: /home/ncvs/src/sys/security/mac_biba/mac_biba.c,v
retrieving revision 1.94
diff -u -r1.94 mac_biba.c
--- sys/security/mac_biba/mac_biba.c	12 Sep 2006 04:25:12 -0000	1.94
+++ sys/security/mac_biba/mac_biba.c	7 Nov 2006 13:49:21 -0000
@@ -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>
Index: sys/security/mac_mls/mac_mls.c
===================================================================
RCS file: /home/ncvs/src/sys/security/mac_mls/mac_mls.c,v
retrieving revision 1.77
diff -u -r1.77 mac_mls.c
--- sys/security/mac_mls/mac_mls.c	12 Sep 2006 04:25:12 -0000	1.77
+++ sys/security/mac_mls/mac_mls.c	7 Nov 2006 13:49:21 -0000
@@ -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>
Index: sys/security/mac_stub/mac_stub.c
===================================================================
RCS file: /home/ncvs/src/sys/security/mac_stub/mac_stub.c,v
retrieving revision 1.56
diff -u -r1.56 mac_stub.c
--- sys/security/mac_stub/mac_stub.c	19 Sep 2005 18:52:51 -0000	1.56
+++ sys/security/mac_stub/mac_stub.c	7 Nov 2006 13:49:21 -0000
@@ -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>
Index: sys/security/mac_test/mac_test.c
===================================================================
RCS file: /home/ncvs/src/sys/security/mac_test/mac_test.c,v
retrieving revision 1.63
diff -u -r1.63 mac_test.c
--- sys/security/mac_test/mac_test.c	19 Sep 2005 18:52:51 -0000	1.63
+++ sys/security/mac_test/mac_test.c	7 Nov 2006 13:49:21 -0000
@@ -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>
Index: sys/sys/sysproto.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/sysproto.h,v
retrieving revision 1.211
diff -u -r1.211 sysproto.h
--- sys/sys/sysproto.h	3 Nov 2006 18:57:49 -0000	1.211
+++ sys/sys/sysproto.h	7 Nov 2006 13:49:31 -0000
@@ -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>
 
Index: sys/sys/thr.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/thr.h,v
retrieving revision 1.11
diff -u -r1.11 thr.h
--- sys/sys/thr.h	22 Sep 2006 15:04:28 -0000	1.11
+++ sys/sys/thr.h	7 Nov 2006 13:49:31 -0000
@@ -30,7 +30,7 @@
 #ifndef _SYS_THR_H_
 #define	_SYS_THR_H_
 
-#include <posix4/sched.h>
+#include <sys/psched.h>
 
 /* Create the thread in the suspended state. */
 #define	THR_SUSPENDED		0x0001
Index: usr.bin/kdump/mksubr
===================================================================
RCS file: /home/ncvs/src/usr.bin/kdump/mksubr,v
retrieving revision 1.4
diff -u -r1.4 mksubr
--- usr.bin/kdump/mksubr	18 Sep 2006 13:49:57 -0000	1.4
+++ usr.bin/kdump/mksubr	7 Nov 2006 13:49:46 -0000
@@ -112,7 +112,7 @@
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <sys/reboot.h>
-#include <sched.h>
+#include <psched.h>
 #include <sys/linker.h>
 #define _KERNEL
 #include <sys/thr.h>
@@ -295,7 +295,7 @@
 auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h"
 auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h"
 auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
-auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sched.h"
+auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "psched.h"
 auto_switch_type "kldunloadfflagsname" "LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h"
 auto_switch_type "ksethrcmdname" "KSE_INTR_[A-Z]+[[:space:]]+[0-9]+" "sys/kse.h"
 auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h"