11 files changed, 11 insertions, 59 deletions

diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 9d7a972c000d..2e5b924bc38c 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -25,10 +25,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.
  *
- *  $Id: linux_ipc.c,v 1.4 1995/12/29 22:12:14 sos Exp $
+ *  $Id: linux_ipc.c,v 1.5 1996/01/05 19:52:49 wollman Exp $
  */
 
-#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 39dce4ce9f84..e375ba06547d 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -23,8 +23,6 @@
  * 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>
@@ -122,7 +120,6 @@ struct msqid_ds *bp;
 	return;
 }
 
-#ifdef SYSVMSG
 int
 ibcs2_msgsys(p, uap, retval)
 	struct proc *p;
@@ -171,7 +168,6 @@ ibcs2_msgsys(p, uap, retval)
 		return EINVAL;
 	}
 }
-#endif
 
 /*
  * iBCS2 semsys call
@@ -227,7 +223,6 @@ struct semid_ds *bp;
 	return;
 }
 
-#ifdef SYSVSEM
 int
 ibcs2_semsys(p, uap, retval)
 	struct proc *p;
@@ -286,7 +281,7 @@ ibcs2_semsys(p, uap, retval)
 	}
 	return EINVAL;
 }
-#endif
+
 
 /*
  * iBCS2 shmsys call
@@ -326,7 +321,6 @@ struct shmid_ds *bp;
 	return;
 }
 
-#ifdef SYSVSHM
 int
 ibcs2_shmsys(p, uap, retval)
 	struct proc *p;
@@ -388,4 +382,3 @@ ibcs2_shmsys(p, uap, retval)
 	}
 	return EINVAL;
 }
-#endif
diff --git a/sys/i386/ibcs2/ibcs2_isc_syscall.h b/sys/i386/ibcs2/ibcs2_isc_syscall.h
index 7f0e36072636..4767212f42c7 100644
--- a/sys/i386/ibcs2/ibcs2_isc_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_isc_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.isc,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.isc,v 1.1 1995/10/10 07:59:26 swallace Exp 
  */
 
 #define	IBCS2_ISC_ibcs2_rename	2
diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index 39a9e8a62955..e8e0609f3173 100644
--- a/sys/i386/ibcs2/ibcs2_isc_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_isc_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.isc,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.isc,v 1.1 1995/10/10 07:59:26 swallace Exp 
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index c394e6fc1555..e23ba9f523d5 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.2 1995/10/10 07:59:28 swallace Exp 
+ * created from	Id: syscalls.master,v 1.4 1996/01/08 04:13:22 peter Exp 
  */
 
 #ifndef _IBCS2_SYSPROTO_H_
@@ -155,7 +155,6 @@ struct	ibcs2_sigsys_args {
 	int sig;
 	ibcs2_sig_t fp;
 };
-#ifdef SYSVMSG
 struct	ibcs2_msgsys_args {
 	int which;
 	int a2;
@@ -164,22 +163,16 @@ struct	ibcs2_msgsys_args {
 	int a5;
 	int a6;
 };
-#else
-#endif
 struct	ibcs2_sysi86_args {
 	int cmd;
 	int * arg;
 };
-#ifdef SYSVSHM
 struct	ibcs2_shmsys_args {
 	int which;
 	int a2;
 	int a3;
 	int a4;
 };
-#else
-#endif
-#ifdef SYSVSEM
 struct	ibcs2_semsys_args {
 	int which;
 	int a2;
@@ -187,8 +180,6 @@ struct	ibcs2_semsys_args {
 	int a4;
 	int a5;
 };
-#else
-#endif
 struct	ibcs2_ioctl_args {
 	int fd;
 	int cmd;
@@ -310,19 +301,10 @@ int	ibcs2_times __P((struct proc *, struct ibcs2_times_args *, int []));
 int	ibcs2_plock __P((struct proc *, struct ibcs2_plock_args *, int []));
 int	ibcs2_setgid __P((struct proc *, struct ibcs2_setgid_args *, int []));
 int	ibcs2_sigsys __P((struct proc *, struct ibcs2_sigsys_args *, int []));
-#ifdef SYSVMSG
 int	ibcs2_msgsys __P((struct proc *, struct ibcs2_msgsys_args *, int []));
-#else
-#endif
 int	ibcs2_sysi86 __P((struct proc *, struct ibcs2_sysi86_args *, int []));
-#ifdef SYSVSHM
 int	ibcs2_shmsys __P((struct proc *, struct ibcs2_shmsys_args *, int []));
-#else
-#endif
-#ifdef SYSVSEM
 int	ibcs2_semsys __P((struct proc *, struct ibcs2_semsys_args *, int []));
-#else
-#endif
 int	ibcs2_ioctl __P((struct proc *, struct ibcs2_ioctl_args *, int []));
 int	ibcs2_uadmin __P((struct proc *, struct ibcs2_uadmin_args *, int []));
 int	ibcs2_utssys __P((struct proc *, struct ibcs2_utssys_args *, int []));
@@ -344,15 +326,6 @@ int	ibcs2_isc __P((struct proc *, struct ibcs2_isc_args *, int []));
 
 #ifdef COMPAT_43
 
-#ifdef SYSVMSG
-#else
-#endif
-#ifdef SYSVSHM
-#else
-#endif
-#ifdef SYSVSEM
-#else
-#endif
 
 #endif /* COMPAT_43 */
 
diff --git a/sys/i386/ibcs2/ibcs2_syscall.h b/sys/i386/ibcs2/ibcs2_syscall.h
index 03163dbab06b..4f07286c6ef8 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.2 1995/10/10 07:59:28 swallace Exp 
+ * created from	Id: syscalls.master,v 1.4 1996/01/08 04:13:22 peter Exp 
  */
 
 #define	IBCS2_SYS_syscall	0
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index a535e80a52e1..1b83401134a7 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.2 1995/10/10 07:59:28 swallace Exp 
+ * created from	Id: syscalls.master,v 1.4 1996/01/08 04:13:22 peter Exp 
  */
 
 #include "opt_sysvipc.h"
@@ -72,23 +72,11 @@ struct sysent ibcs2_sysent[] = {
 	{ 1, (sy_call_t *)ibcs2_setgid },		/* 46 = ibcs2_setgid */
 	{ 0, (sy_call_t *)getgid },			/* 47 = getgid */
 	{ 2, (sy_call_t *)ibcs2_sigsys },		/* 48 = ibcs2_sigsys */
-#ifdef SYSVMSG
 	{ 6, (sy_call_t *)ibcs2_msgsys },		/* 49 = ibcs2_msgsys */
-#else
-	{ 0, (sy_call_t *)nosys },			/* 49 = nosys */
-#endif
 	{ 2, (sy_call_t *)ibcs2_sysi86 },		/* 50 = ibcs2_sysi86 */
 	{ 0, (sy_call_t *)nosys },			/* 51 = ibcs2_acct */
-#ifdef SYSVSHM
 	{ 4, (sy_call_t *)ibcs2_shmsys },		/* 52 = ibcs2_shmsys */
-#else
-	{ 0, (sy_call_t *)nosys },			/* 52 = nosys */
-#endif
-#ifdef SYSVSEM
 	{ 5, (sy_call_t *)ibcs2_semsys },		/* 53 = ibcs2_semsys */
-#else
-	{ 0, (sy_call_t *)nosys },			/* 53 = nosys */
-#endif
 	{ 3, (sy_call_t *)ibcs2_ioctl },		/* 54 = ibcs2_ioctl */
 	{ 3, (sy_call_t *)ibcs2_uadmin },		/* 55 = ibcs2_uadmin */
 	{ 0, (sy_call_t *)nosys },			/* 56 = nosys */
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index 45f0085ea978..99cf49bb8423 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.xenix,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.xenix,v 1.1 1995/10/10 07:59:29 swallace Exp 
  */
 
 #ifndef _IBCS2_XENIX_H_
diff --git a/sys/i386/ibcs2/ibcs2_xenix_syscall.h b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
index 4d0b422d3000..d038068ff111 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.xenix,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.xenix,v 1.1 1995/10/10 07:59:29 swallace Exp 
  */
 
 #define	IBCS2_XENIX_xenix_rdchk	7
diff --git a/sys/i386/ibcs2/ibcs2_xenix_sysent.c b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
index fdffa3ac4cea..93d599b0fb81 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.xenix,v 1.1 1995/10/06 15:12:52 swallace Exp 
+ * created from	Id: syscalls.xenix,v 1.1 1995/10/10 07:59:29 swallace Exp 
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c
index 9d7a972c000d..2e5b924bc38c 100644
--- a/sys/i386/linux/linux_ipc.c
+++ b/sys/i386/linux/linux_ipc.c
@@ -25,10 +25,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.
  *
- *  $Id: linux_ipc.c,v 1.4 1995/12/29 22:12:14 sos Exp $
+ *  $Id: linux_ipc.c,v 1.5 1996/01/05 19:52:49 wollman Exp $
  */
 
-#include "opt_sysvipc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>