Fri Nov 6 01:00:41 2015 UTC ()

As long as we still claim to build each subcomponent separately, make
sure we properly define the (sub)set of syscalls we're building.


(pgoyette)

diff -r1.28 -r1.29 src/sys/kern/sysv_ipc.c

--- src/sys/kern/sysv_ipc.c 2015/05/13 02:06:25	1.28
+++ src/sys/kern/sysv_ipc.c 2015/11/06 01:00:41	1.29

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysv_ipc.c,v 1.28 2015/05/13 02:06:25 pgoyette Exp $	*/
+/*	$NetBSD: sysv_ipc.c,v 1.29 2015/11/06 01:00:41 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.28 2015/05/13 02:06:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.29 2015/11/06 01:00:41 pgoyette Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_sysv.h"
 #endif
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 #include <sys/syscallvar.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/ipc.h>
 #ifdef SYSVMSG
 @@ -127,38 +127,44 @@ struct	msginfo msginfo = {
 MODULE(MODULE_CLASS_EXEC, sysv_ipc, NULL);
 #ifdef _MODULE
 SYSCTL_SETUP_PROTO(sysctl_ipc_setup);
 SYSCTL_SETUP_PROTO(sysctl_ipc_shm_setup);
 SYSCTL_SETUP_PROTO(sysctl_ipc_sem_setup);
 SYSCTL_SETUP_PROTO(sysctl_ipc_msg_setup);
 static struct sysctllog *sysctl_sysvipc_clog = NULL;
 #endif
 static const struct syscall_package sysvipc_syscalls[] = {
 #ifdef SYSVSHM
 	{ SYS___shmctl50, 0, (sy_call_t *)sys___shmctl50 },
 	{ SYS_shmat, 0, (sy_call_t *)sys_shmat },
 	{ SYS_shmdt, 0, (sy_call_t *)sys_shmdt },
 	{ SYS_shmget, 0, (sy_call_t *)sys_shmget },
 #endif
 #ifdef SYSVSEM
 	{ SYS_____semctl50, 0, (sy_call_t *)sys_____semctl50 },
 	{ SYS_semget, 0, (sy_call_t *)sys_semget },
 	{ SYS_semop, 0, (sy_call_t *)sys_semop },
 	{ SYS_semconfig, 0, (sy_call_t *)sys_semconfig },
 #endif
 #ifdef SYSVMSG
 	{ SYS___msgctl50, 0, (sy_call_t *)sys___msgctl50 },
 	{ SYS_msgget, 0, (sy_call_t *)sys_msgget },
 	{ SYS_msgsnd, 0, (sy_call_t *)sys_msgsnd },
 	{ SYS_msgrcv, 0, (sy_call_t *)sys_msgrcv },
 #endif
 	{ 0, 0, NULL }
 };
 static int
 sysv_ipc_modcmd(modcmd_t cmd, void *arg)
+{
 	int error = 0;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		/* Link the system calls */
 		error = syscall_establish(NULL, sysvipc_syscalls);