Sat Mar 10 04:35:15 2018 UTC ()
Update module dependency - it now requires compat_sysvipc


(pgoyette)
diff -r1.18 -r1.18.16.1 src/sys/compat/netbsd32/netbsd32_ipc.c
cvs diff -r1.18 -r1.18.16.1 src/sys/compat/netbsd32/netbsd32_ipc.c (expand / switch to unified diff)

--- src/sys/compat/netbsd32/netbsd32_ipc.c 2015/12/03 10:38:21 1.18
+++ src/sys/compat/netbsd32/netbsd32_ipc.c 2018/03/10 04:35:15 1.18.16.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: netbsd32_ipc.c,v 1.18 2015/12/03 10:38:21 pgoyette Exp $ */ 1/* $NetBSD: netbsd32_ipc.c,v 1.18.16.1 2018/03/10 04:35:15 pgoyette Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1998, 2001 Matthew R. Green 4 * Copyright (c) 1998, 2001 Matthew R. Green
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,27 +17,27 @@ @@ -17,27 +17,27 @@
17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18 2015/12/03 10:38:21 pgoyette Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.1 2018/03/10 04:35:15 pgoyette Exp $");
31 31
32#if defined(_KERNEL_OPT) 32#if defined(_KERNEL_OPT)
33#include "opt_sysv.h" 33#include "opt_sysv.h"
34#endif 34#endif
35 35
36#include <sys/param.h> 36#include <sys/param.h>
37#include <sys/systm.h> 37#include <sys/systm.h>
38#include <sys/ipc.h> 38#include <sys/ipc.h>
39#include <sys/msg.h> 39#include <sys/msg.h>
40#include <sys/sem.h> 40#include <sys/sem.h>
41#include <sys/shm.h> 41#include <sys/shm.h>
42#include <sys/mount.h> 42#include <sys/mount.h>
43#include <sys/module.h> 43#include <sys/module.h>
@@ -101,27 +101,28 @@ static const struct syscall_package comp @@ -101,27 +101,28 @@ static const struct syscall_package comp
101#if defined(COMPAT_10) 101#if defined(COMPAT_10)
102 _PKG_ENTRY2(compat_10_omsgsys, compat_10_netbsd32_msgsys), 102 _PKG_ENTRY2(compat_10_omsgsys, compat_10_netbsd32_msgsys),
103#endif 103#endif
104#if defined(COMPAT_14) 104#if defined(COMPAT_14)
105 _PKG_ENTRY(compat_14_netbsd32_msgctl), 105 _PKG_ENTRY(compat_14_netbsd32_msgctl),
106#endif 106#endif
107#if defined(COMPAT_50) 107#if defined(COMPAT_50)
108 _PKG_ENTRY(compat_50_netbsd32___msgctl13), 108 _PKG_ENTRY(compat_50_netbsd32___msgctl13),
109#endif 109#endif
110#endif /* SYSVMSG */ 110#endif /* SYSVMSG */
111 { 0, 0, NULL } 111 { 0, 0, NULL }
112}; 112};
113 113
114MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc, "sysv_ipc,compat_netbsd32"); 114MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc,
 115 "sysv_ipc,compat_netbsd32,compat_sysvipc");
115 116
116static int 117static int
117compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg) 118compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg)
118{ 119{
119 int error; 120 int error;
120 121
121 switch (cmd) { 122 switch (cmd) {
122 case MODULE_CMD_INIT: 123 case MODULE_CMD_INIT:
123 error = syscall_establish(&emul_netbsd32, 124 error = syscall_establish(&emul_netbsd32,
124 compat_sysvipc_syscalls); 125 compat_sysvipc_syscalls);
125 break; 126 break;
126 case MODULE_CMD_FINI: 127 case MODULE_CMD_FINI:
127 error = syscall_disestablish(&emul_netbsd32, 128 error = syscall_disestablish(&emul_netbsd32,