Convert SYSV IPC to new-style options. (I hope I got everything...)

The LKMs will need an extra file, to come later.

21 files changed, 48 insertions, 23 deletions

diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index b0c77b0aa371..8c3b7e9f1aa6 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.29 1995/12/03 18:35:17 bde Exp $
+ *	$Id: genassym.c,v 1.30 1995/12/07 12:45:30 davidg Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/buf.h>
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index aafa7f8cb7f4..f3a73ee55095 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,11 +35,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.165 1995/12/28 23:14:35 davidg Exp $
+ *	$Id: machdep.c,v 1.166 1995/12/30 23:13:32 davidg Exp $
  */
 
 #include "npx.h"
 #include "isa.h"
+#include "opt_sysvipc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/conf/options b/sys/conf/options
index 43a2d563ed0b..2a2fe63b626d 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,2 +1,5 @@
 KTRACE
 PROCFS
+SYSVSHM		opt_sysvipc.h
+SYSVSEM		opt_sysvipc.h
+SYSVMSG		opt_sysvipc.h
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 605065dc3f74..b99f78a11aae 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.12 1995/07/29 11:38:39 bde Exp $
+ * $Id: param.c,v 1.13 1995/12/10 13:44:55 phk Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -57,10 +59,10 @@
 #include <sys/shm.h>
 #endif
 #ifdef SYSVSEM
-#include "sys/sem.h"
+#include <sys/sem.h>
 #endif
 #ifdef SYSVMSG
-#include "sys/msg.h"
+#include <sys/msg.h>
 #endif
 
 /*
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index b0c77b0aa371..8c3b7e9f1aa6 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.29 1995/12/03 18:35:17 bde Exp $
+ *	$Id: genassym.c,v 1.30 1995/12/07 12:45:30 davidg Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/buf.h>
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index aafa7f8cb7f4..f3a73ee55095 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,11 +35,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.165 1995/12/28 23:14:35 davidg Exp $
+ *	$Id: machdep.c,v 1.166 1995/12/30 23:13:32 davidg Exp $
  */
 
 #include "npx.h"
 #include "isa.h"
+#include "opt_sysvipc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index fe8fb5d44872..39dce4ce9f84 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -22,6 +22,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include "opt_sysvipc.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index 7d77c2017046..c394e6fc1555 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.master,v 1.2 1995/10/10 07:59:28 swallace Exp 
  */
 
 #ifndef _IBCS2_SYSPROTO_H_
diff --git a/sys/i386/ibcs2/ibcs2_syscall.h b/sys/i386/ibcs2/ibcs2_syscall.h
index eb4f2fbd28d6..03163dbab06b 100644
--- a/sys/i386/ibcs2/ibcs2_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.master,v 1.2 1995/10/10 07:59:28 swallace Exp 
  */
 
 #define	IBCS2_SYS_syscall	0
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index 0453bd6b055c..a535e80a52e1 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -2,9 +2,10 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.master,v 1.2 1995/10/10 07:59:28 swallace Exp 
  */
 
+#include "opt_sysvipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index 0423cd34453e..c0397820014b 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.1 1995/10/06 15:12:52 swallace Exp $
+	$Id: syscalls.master,v 1.2 1995/10/10 07:59:28 swallace Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from IBCS2).
@@ -22,6 +22,7 @@
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 
+#include "opt_sysvipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 4d449e54e7af..3eeda1bd2043 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,9 +2,10 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp 
+ * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
  */
 
+#include "opt_sysvipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index cade8e54faff..6fe547971ed3 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -28,9 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.29 1995/12/09 04:29:11 peter Exp $
+ *	$Id: kern_exec.c,v 1.30 1995/12/14 08:31:20 phk Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 3a9f61c949f0..8e866e2674b8 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.23 1996/01/01 12:23:39 peter Exp $
+ * $Id: kern_exit.c,v 1.24 1996/01/03 21:42:00 wollman Exp $
  */
 
 #include "opt_ktrace.h"
+#include "opt_sysvipc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 605065dc3f74..b99f78a11aae 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.12 1995/07/29 11:38:39 bde Exp $
+ * $Id: param.c,v 1.13 1995/12/10 13:44:55 phk Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -57,10 +59,10 @@
 #include <sys/shm.h>
 #endif
 #ifdef SYSVSEM
-#include "sys/sem.h"
+#include <sys/sem.h>
 #endif
 #ifdef SYSVMSG
-#include "sys/msg.h"
+#include <sys/msg.h>
 #endif
 
 /*
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 8b76ff7ac70b..33a74c079923 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp 
+ * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
  */
 
 char *syscallnames[] = {
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index a97de8681e28..a472e3ad9f12 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp $
+	$Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -24,6 +24,7 @@
 
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
+#include "opt_sysvipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index 09d10d900644..a8b1fb6361b8 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -2,7 +2,7 @@
  * System call hiders.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp 
+ * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
  */
 
 HIDE_POSIX(fork)
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 3db9ed0bc8ca..d4384d2ae95e 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp 
+ * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 2c7a300ab4aa..f6614276384e 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp 
+ * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index e6e0ffccbcbe..71648ca2c91e 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,9 +59,11 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.32 1995/12/07 12:48:11 davidg Exp $
+ * $Id: vm_glue.c,v 1.33 1995/12/14 09:54:57 phk Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>