 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysv_mod.c,v 1.1.2.5 2018/03/09 04:48:42 pgoyette Exp $	*/
+/*	$NetBSD: sysv_mod.c,v 1.1.2.6 2018/03/09 09:37:01 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Paul Goyette
+ *
  * 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,47 +20,47 @@
  * ``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_mod.c,v 1.1.2.5 2018/03/09 04:48:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_mod.c,v 1.1.2.6 2018/03/09 09:37:01 pgoyette Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_sysv.h"
 #endif
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 #include <sys/syscallvar.h>
 #include <sys/sysctl.h>
 #include <compat/common/sysv_mod.h>
 #ifdef COMPAT_50
 int sysctl_kern_sysvipc50(SYSCTLFN_PROTO);
 #endif
-MODULE(MODULE_CLASS_EXEC, compat_sysv_ipc, "sysv_ipc");
+MODULE(MODULE_CLASS_EXEC, compat_sysv, "sysv_ipc");
 /* Build the syscall package based on options specified */
 static const struct syscall_package compat_syscalls[] = {
 #if defined(COMPAT_10) && !defined(_LP64)
 #ifdef	SYSVSHM
 	{ SYS_compat_10_oshmsys, 0, (sy_call_t *)compat_10_sys_shmsys },
 #endif
 #ifdef	SYSVSEM
 	{ SYS_compat_10_osemsys, 0, (sy_call_t *)compat_10_sys_semsys },
 #endif
 #ifdef	SYSVMSG
 	{ SYS_compat_10_omsgsys, 0, (sy_call_t *)compat_10_sys_msgsys },
 @@ -85,29 +85,29 @@ static const struct syscall_package comp
 #endif
 #ifdef	SYSVSEM
 	{ SYS_compat_50_____semctl13, 0, (sy_call_t *)compat_50_sys_____semctl13 },
 #endif
 #ifdef	SYSVMSG
 	{ SYS_compat_50___msgctl13, 0, (sy_call_t *)compat_50_sys___msgctl13 },
 #endif
 #endif	/* defined(COMPAT_50) */
 	{ 0, 0, NULL }
 };
 static int
-compat_sysv_ipc_modcmd(modcmd_t cmd, void *arg)
+compat_sysv_modcmd(modcmd_t cmd, void *arg)
+{
-	static (*orig_sysvipc50_sysctl)(SYSCTLFN_PROTO);
+	static int (*orig_sysvipc50_sysctl)(SYSCTLFN_PROTO);
 	int error = 0;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		error = syscall_establish(NULL, compat_syscalls);
 		if (error != 0) {
 			break;
+		}
 #if defined(COMPAT_50)
 		orig_sysvipc50_sysctl = vec_sysvipc50_sysctl;
 		vec_sysvipc50_sysctl = sysctl_kern_sysvipc50;
 #endif

 @@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.3.10.2 2018/03/09 03:58:33 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3.10.3 2018/03/09 09:37:01 pgoyette Exp $
 .include "../Makefile.inc"
 .PATH:	${S}/kern
 KMOD=	compat_sysv
 CPPFLAGS+=	-DSYSVSEM -DSYSVSHM -DSYSVMSG
 .PATH:	${S}/compat/common
 CPPFLAGS+=	-DCOMPAT_10
 CPPFLAGS+=	-DCOMPAT_13
 CPPFLAGS+=	-DCOMPAT_14
 CPPFLAGS+=	-DCOMPAT_50
-SRCS+=	sysv_ipc.c
+SRCS+=	sysv_mod.c
 SRCS+=	kern_ipc_10.c
 SRCS+=	sysv_msg_14.c sysv_sem_14.c sysv_shm_14.c
 SRCS+=	sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c
 .include <bsd.kmodule.mk>