From e7ae3bf08d634e9f81d1c6bb83b01924897790dd Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 8 Jan 1996 04:13:25 +0000
Subject: [PATCH] Remove the #ifdef SYSVSHM etc.  Always call the functions,
 some stubs are about to go in.  This is to fix the problem with the ibcs2 and
 linux lkm's not being able to call the sysv ipc functions unless the build is
 modified.

---
 sys/i386/ibcs2/syscalls.master | 14 +-------------
 sys/kern/syscalls.master       | 35 +---------------------------------
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index c0397820014..c8727d61cad 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.2 1995/10/10 07:59:28 swallace Exp $
+	$Id: syscalls.master,v 1.3 1996/01/04 20:28:38 wollman Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from IBCS2).
@@ -92,25 +92,13 @@
 46	STD	SVR3	{ int ibcs2_setgid(int gid); }
 47	NOPROTO	SVR3	{ gid_t getgid(void); }
 48	STD	SVR3	{ int ibcs2_sigsys(int sig, ibcs2_sig_t fp); }
-#ifdef SYSVMSG
 49	STD	SVR3	{ int ibcs2_msgsys(int which, int a2, int a3, int a4, \
 				     int a5, int a6); }
-#else
-49	UNIMPL	SVR3	nosys
-#endif
 50	STD	SVR3	{ int ibcs2_sysi86(int cmd, int *arg); }
 51	UNIMPL	SVR3	ibcs2_acct
-#ifdef SYSVSHM
 52	STD	SVR3	{ int ibcs2_shmsys(int which, int a2, int a3, int a4); }
-#else
-52	UNIMPL	SVR3	nosys
-#endif
-#ifdef SYSVSEM
 53	STD	SVR3	{ int ibcs2_semsys(int which, int a2, int a3, int a4, \
 				     int a5); }
-#else
-53	UNIMPL	SVR3	nosys
-#endif
 54	STD	SVR3	{ int ibcs2_ioctl(int fd, int cmd, caddr_t data); }
 55	STD	SVR3	{ int ibcs2_uadmin(int cmd, int func, caddr_t data); }
 56	UNIMPL	SVR3	nosys
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index a472e3ad9f1..e715693d841 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp $
+	$Id: syscalls.master,v 1.22 1996/01/04 20:28:48 wollman Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -274,26 +274,14 @@
 			    struct rtprio *rtp); }
 167	UNIMPL	NOHIDE	nosys
 168	UNIMPL	NOHIDE	nosys
-#ifdef SYSVSEM
 169	STD	BSD	{ int semsys(int which, int a2, int a3, int a4, \
 			    int a5); }
 ; XXX should be		{ int semsys(int which, ...); }
-#else
-169	UNIMPL	NOHIDE	nosys
-#endif
-#ifdef SYSVMSG
 170	STD	BSD	{ int msgsys(int which, int a2, int a3, int a4, \
 			    int a5, int a6); }
 ; XXX should be		{ int msgsys(int which, ...); }
-#else
-170	UNIMPL	NOHIDE nosys
-#endif
-#ifdef SYSVSHM
 171	STD	BSD	{ int shmsys(int which, int a2, int a3, int a4); }
 ; XXX should be		{ int shmsys(int which, ...); }
-#else
-171	UNIMPL	BSD	nosys
-#endif
 172	UNIMPL	NOHIDE	nosys
 173	UNIMPL	NOHIDE	nosys
 174	UNIMPL	NOHIDE	nosys
@@ -372,20 +360,12 @@
 ;
 ; The following were originally used in NetBSD.
 ;
-#ifdef SYSVSEM
 220	STD	BSD	{ int __semctl(int semid, int semnum, int cmd, \
 			    union semun *arg); }
 221	STD	BSD	{ int semget(key_t key, int nsems, int semflg); }
 222	STD	BSD	{ int semop(int semid, struct sembuf *sops, \
 			    u_int nsops); }
 223	STD	BSD	{ int semconfig(int flag); }
-#else
-220	UNIMPL	BSD	semctl
-221	UNIMPL	BSD	semget
-222	UNIMPL	BSD	semop
-223	UNIMPL	BSD	semconfig
-#endif
-#ifdef SYSVMSG
 224	STD	BSD	{ int msgctl(int msqid, int cmd, \
 			    struct msqid_ds *buf); }
 225	STD	BSD	{ int msgget(key_t key, int msgflg); }
@@ -393,21 +373,8 @@
 			    int msgflg); }
 227	STD	BSD	{ int msgrcv(int msqid, void *msgp, size_t msgsz, \
 			    long msgtyp, int msgflg); }
-#else
-224	UNIMPL	BSD	msgctl
-225	UNIMPL	BSD	msgget
-226	UNIMPL	BSD	msgsnd
-227	UNIMPL	BSD	msgrcv
-#endif
-#ifdef SYSVSHM
 228	STD	BSD	{ int shmat(int shmid, void *shmaddr, int shmflg); }
 229	STD	BSD	{ int shmctl(int shmid, int cmd, \
 			    struct shmid_ds *buf); }
 230	STD	BSD	{ int shmdt(void *shmaddr); }
 231	STD	BSD	{ int shmget(key_t key, int size, int shmflg); }
-#else
-228	UNIMPL	BSD	shmat
-229	UNIMPL	BSD	shmctl
-230	UNIMPL	BSD	shmdt
-231	UNIMPL	BSD	shmget
-#endif