Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/rump/librump/rumpkern/rump_syscalls.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/rump/librump/rumpkern/rump_syscalls.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.137.2.9
retrieving revision 1.138
diff -u -p -r1.137.2.9 -r1.138
--- src/sys/rump/librump/rumpkern/rump_syscalls.c	2018/09/06 06:56:46	1.137.2.9
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c	2018/07/12 10:46:48	1.138
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.137.2.9 2018/09/06 06:56:46 pgoyette Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.138 2018/07/12 10:46:48 maxv Exp $ */
 
 /*
  * System call vector and marshalling for rump.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
+ * created from	NetBSD: syscalls.master,v 1.291 2018/01/06 16:41:23 kamil Exp
  */
 
 #ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
 
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.137.2.9 2018/09/06 06:56:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.138 2018/07/12 10:46:48 maxv Exp $");
 
 #include <sys/fstypes.h>
 #include <sys/proc.h>
@@ -2224,38 +2224,6 @@ __weak_alias(_fpathconf,rump___sysimpl_f
 __strong_alias(_sys_fpathconf,rump___sysimpl_fpathconf);
 #endif /* RUMP_KERNEL_IS_LIBC */
 
-int rump___sysimpl_getsockopt2(int, int, int, void *, socklen_t *);
-int
-rump___sysimpl_getsockopt2(int s, int level, int name, void * val, socklen_t * avalsize)
-{
-	register_t retval[2];
-	int error = 0;
-	int rv = -1;
-	struct sys_getsockopt2_args callarg;
-
-	memset(&callarg, 0, sizeof(callarg));
-	SPARG(&callarg, s) = s;
-	SPARG(&callarg, level) = level;
-	SPARG(&callarg, name) = name;
-	SPARG(&callarg, val) = val;
-	SPARG(&callarg, avalsize) = avalsize;
-
-	error = rsys_syscall(SYS_getsockopt2, &callarg, sizeof(callarg), retval);
-	rsys_seterrno(error);
-	if (error == 0) {
-		if (sizeof(int) > sizeof(register_t))
-			rv = *(int *)retval;
-		else
-			rv = *retval;
-	}
-	return rv;
-}
-#ifdef RUMP_KERNEL_IS_LIBC
-__weak_alias(getsockopt2,rump___sysimpl_getsockopt2);
-__weak_alias(_getsockopt2,rump___sysimpl_getsockopt2);
-__strong_alias(_sys_getsockopt2,rump___sysimpl_getsockopt2);
-#endif /* RUMP_KERNEL_IS_LIBC */
-
 int rump___sysimpl_getrlimit(int, struct rlimit *);
 int
 rump___sysimpl_getrlimit(int which, struct rlimit * rlp)
@@ -7244,8 +7212,7 @@ struct sysent rump_sysent[] = {
 		.sy_call = (sy_call_t *)rumpns_enosys,
 	},		/* 174 = pwrite */
 	{
-		.sy_flags = SYCALL_NOSYS,
-		.sy_call = (sy_call_t *)rumpns_sys_nomodule,
+		.sy_call = (sy_call_t *)rumpns_enosys,
 },		/* 175 = ntp_gettime */
 #if defined(NTP) || !defined(_KERNEL_OPT)
 	{
@@ -7322,9 +7289,9 @@ struct sysent rump_sysent[] = {
 		.sy_call = (sy_call_t *)rumpns_enosys,
 	},		/* 192 = fpathconf */
 	{
-		ns(struct sys_getsockopt2_args),
+		.sy_flags = SYCALL_NOSYS,
 		.sy_call = (sy_call_t *)rumpns_enosys,
-	},		/* 193 = getsockopt2 */
+	},		/* 193 = filler */
 	{
 		ns(struct sys_getrlimit_args),
 		.sy_call = (sy_call_t *)rumpns_enosys,
@@ -7834,28 +7801,22 @@ struct sysent rump_sysent[] = {
 		.sy_call = (sy_call_t *)rumpns_enosys,
 	},		/* 329 = filler */
 	{
-		.sy_flags = SYCALL_NOSYS,
-		.sy_call = (sy_call_t *)rumpns_sys_nomodule,
+		.sy_call = (sy_call_t *)rumpns_enosys,
 },		/* 330 = sa_register */
 	{
-		.sy_flags = SYCALL_NOSYS,
-		.sy_call = (sy_call_t *)rumpns_sys_nomodule,
+		.sy_call = (sy_call_t *)rumpns_enosys,
 },		/* 331 = sa_stacks */
 	{
-		.sy_flags = SYCALL_NOSYS,
-		.sy_call = (sy_call_t *)rumpns_sys_nomodule,
+		.sy_call = (sy_call_t *)rumpns_enosys,
 },		/* 332 = sa_enable */
 	{
-		.sy_flags = SYCALL_NOSYS,
-		.sy_call = (sy_call_t *)rumpns_sys_nomodule,
+		.sy_call = (sy_call_t *)rumpns_enosys,
 },		/* 333 = sa_setconcurrency */
 	{
-		.sy_flags = SYCALL_NOSYS,
-		.sy_call = (sy_call_t *)rumpns_sys_nomodule,
+		.sy_call = (sy_call_t *)rumpns_enosys,
 },		/* 334 = sa_yield */
 	{
-		.sy_flags = SYCALL_NOSYS,
-		.sy_call = (sy_call_t *)rumpns_sys_nomodule,
+		.sy_call = (sy_call_t *)rumpns_enosys,
 },		/* 335 = sa_preempt */
 	{
 		.sy_flags = SYCALL_NOSYS,
@@ -8545,25 +8506,6 @@ struct sysent rump_sysent[] = {
 		.sy_call = (sy_call_t *)rumpns_enosys,
 	},		/* 511 = filler */
 };
-
-const uint32_t rump_sysent_nomodbits[] = {
-	0x042c4180,	/* syscalls   0- 31 */
-	0xc0b14140,	/* syscalls  32- 63 */
-	0x23f80083,	/* syscalls  64- 95 */
-	0x2437f0ea,	/* syscalls  96-127 */
-	0x7877f406,	/* syscalls 128-159 */
-	0x7f000e1e,	/* syscalls 160-191 */
-	0xf0044010,	/* syscalls 192-223 */
-	0xff9167ff,	/* syscalls 224-255 */
-	0x01d107ff,	/* syscalls 256-287 */
-	0x0000fc88,	/* syscalls 288-319 */
-	0x02000001,	/* syscalls 320-351 */
-	0x00600080,	/* syscalls 352-383 */
-	0x007fc338,	/* syscalls 384-415 */
-	0x1c470040,	/* syscalls 416-447 */
-	0x00000000,	/* syscalls 448-479 */
-	0x00000000,	/* syscalls 480-511 */
-};
 CTASSERT(__arraycount(rump_sysent) == SYS_NSYSENT);
 __strong_alias(rumpns_sysent,rump_sysent);
 #endif /* RUMP_CLIENT */