Module Name: src
Committed By: kamil
Date: Tue Dec 19 19:40:04 UTC 2017
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c syscalls.master
src/sys/kern: init_sysent.c syscalls.c syscalls.master
syscalls_autoload.c systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
src/sys/uvm: uvm_unix.c
Log Message:
Drop SYS_vadvise
The (o)vadvise syscall is dummy since the beginning of NetBSD.
It is an obsolete remnant from the old UNIX.
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.132 -r1.133 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.130 -r1.131 src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/netbsd32/netbsd32_systrace_args.c
cvs rdiff -u -r1.118 -r1.119 src/sys/compat/netbsd32/syscalls.master
cvs rdiff -u -r1.317 -r1.318 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.308 -r1.309 src/sys/kern/syscalls.c
cvs rdiff -u -r1.289 -r1.290 src/sys/kern/syscalls.master
cvs rdiff -u -r1.25 -r1.26 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.106 -r1.107 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.135 -r1.136 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.302 -r1.303 src/sys/sys/syscall.h
cvs rdiff -u -r1.286 -r1.287 src/sys/sys/syscallargs.h
cvs rdiff -u -r1.48 -r1.49 src/sys/uvm/uvm_unix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.210 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.211
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.210 Tue Dec 19 18:34:47 2017
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Dec 19 19:40:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.210 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.211 2017/12/19 19:40:03 kamil Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.210 2017/12/19 18:34:47 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.211 2017/12/19 19:40:03 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -2006,17 +2006,6 @@ netbsd32___fhopen40(struct lwp *l, const
}
/* virtual memory syscalls */
-int
-netbsd32_ovadvise(struct lwp *l, const struct netbsd32_ovadvise_args *uap, register_t *retval)
-{
- /* {
- syscallarg(int) anom;
- } */
- struct sys_ovadvise_args ua;
-
- NETBSD32TO64_UAP(anom);
- return (sys_ovadvise(l, &ua, retval));
-}
void
netbsd32_adjust_limits(struct proc *p)
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.132 src/sys/compat/netbsd32/netbsd32_syscall.h:1.133
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.132 Tue Dec 19 18:34:47 2017
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Dec 19 19:40:03 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.132 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.133 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -218,9 +218,7 @@
/* syscall: "compat_43_netbsd32_ommap" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" */
#define NETBSD32_SYS_compat_43_netbsd32_ommap 71
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define NETBSD32_SYS_vadvise 72
-
+ /* 72 is obsolete vadvise */
/* syscall: "netbsd32_munmap" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */
#define NETBSD32_SYS_netbsd32_munmap 73
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.132 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.133
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.132 Tue Dec 19 18:34:47 2017
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Dec 19 19:40:03 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.132 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.133 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -385,11 +385,6 @@ struct compat_43_netbsd32_ommap_args {
};
check_syscall_args(compat_43_netbsd32_ommap)
-struct netbsd32_ovadvise_args {
- syscallarg(int) anom;
-};
-check_syscall_args(netbsd32_ovadvise)
-
struct netbsd32_munmap_args {
syscallarg(netbsd32_voidp) addr;
syscallarg(netbsd32_size_t) len;
@@ -2731,8 +2726,6 @@ int sys_vfork(struct lwp *, const void *
int compat_43_netbsd32_ommap(struct lwp *, const struct compat_43_netbsd32_ommap_args *, register_t *);
-int netbsd32_ovadvise(struct lwp *, const struct netbsd32_ovadvise_args *, register_t *);
-
int netbsd32_munmap(struct lwp *, const struct netbsd32_munmap_args *, register_t *);
int netbsd32_mprotect(struct lwp *, const struct netbsd32_mprotect_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.130 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.131
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.130 Tue Dec 19 18:34:47 2017
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Dec 19 19:40:03 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.130 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.131 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.130 2017/12/19 18:34:47 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.131 2017/12/19 19:40:03 kamil Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -100,7 +100,7 @@ const char *const netbsd32_syscallnames[
/* 69 */ "#69 (obsolete sbrk)",
/* 70 */ "#70 (obsolete sstk)",
/* 71 */ "compat_43_netbsd32_ommap",
- /* 72 */ "vadvise",
+ /* 72 */ "#72 (obsolete vadvise)",
/* 73 */ "netbsd32_munmap",
/* 74 */ "netbsd32_mprotect",
/* 75 */ "netbsd32_madvise",
@@ -630,7 +630,7 @@ const char *const altnetbsd32_syscallnam
/* 69 */ NULL, /* obsolete sbrk */
/* 70 */ NULL, /* obsolete sstk */
/* 71 */ NULL, /* compat_43_netbsd32_ommap */
- /* 72 */ "ovadvise",
+ /* 72 */ NULL, /* obsolete vadvise */
/* 73 */ "munmap",
/* 74 */ "mprotect",
/* 75 */ "madvise",
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.130 src/sys/compat/netbsd32/netbsd32_sysent.c:1.131
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.130 Tue Dec 19 18:34:47 2017
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Tue Dec 19 19:40:03 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.130 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.131 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.130 2017/12/19 18:34:47 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.131 2017/12/19 19:40:03 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -391,9 +391,8 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)compat_43(netbsd32_ommap)
}, /* 71 = compat_43_netbsd32_ommap */
{
- ns(struct netbsd32_ovadvise_args),
- .sy_call = (sy_call_t *)netbsd32_ovadvise
- }, /* 72 = vadvise */
+ .sy_call = sys_nosys,
+ }, /* 72 = filler */
{
ns(struct netbsd32_munmap_args),
.sy_call = (sy_call_t *)netbsd32_munmap
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.11 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.12
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.11 Wed May 10 06:19:49 2017
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Tue Dec 19 19:40:03 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.11 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.12 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.115 2016/10/19 09:44:01 skrll Exp
+ * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.11 2017/05/10 06:19:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.12 2017/12/19 19:40:03 kamil Exp $");
#include <sys/proc.h>
static struct sc_autoload netbsd32_syscalls_autoload[] = {
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.22 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.23
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.22 Tue Dec 19 18:34:47 2017
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Tue Dec 19 19:40:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.22 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.23 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -534,13 +534,6 @@ systrace_args(register_t sysnum, const v
*n_args = 6;
break;
}
- /* netbsd32_ovadvise */
- case 72: {
- const struct netbsd32_ovadvise_args *p = params;
- iarg[0] = SCARG(p, anom); /* int */
- *n_args = 1;
- break;
- }
/* netbsd32_munmap */
case 73: {
const struct netbsd32_munmap_args *p = params;
@@ -4284,16 +4277,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* netbsd32_ovadvise */
- case 72:
- switch(ndx) {
- case 0:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* netbsd32_munmap */
case 73:
switch(ndx) {
@@ -9635,11 +9618,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* netbsd32_ovadvise */
- case 72:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* netbsd32_munmap */
case 73:
if (ndx == 0 || ndx == 1)
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.118 src/sys/compat/netbsd32/syscalls.master:1.119
--- src/sys/compat/netbsd32/syscalls.master:1.118 Tue Dec 19 18:34:47 2017
+++ src/sys/compat/netbsd32/syscalls.master Tue Dec 19 19:40:03 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp $
+ $NetBSD: syscalls.master,v 1.119 2017/12/19 19:40:03 kamil Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -179,7 +179,7 @@
71 COMPAT_43 { int|netbsd32||ommap(netbsd32_voidp addr, \
netbsd32_size_t len, int prot, int flags, int fd, \
netbsd32_long pos); }
-72 STD { int|netbsd32||ovadvise(int anom); } vadvise
+72 OBSOL vadvise
73 STD { int|netbsd32||munmap(netbsd32_voidp addr, \
netbsd32_size_t len); }
74 STD { int|netbsd32||mprotect(netbsd32_voidp addr, \
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.317 src/sys/kern/init_sysent.c:1.318
--- src/sys/kern/init_sysent.c:1.317 Tue Dec 19 18:34:47 2017
+++ src/sys/kern/init_sysent.c Tue Dec 19 19:40:03 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.317 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: init_sysent.c,v 1.318 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.317 2017/12/19 18:34:47 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.318 2017/12/19 19:40:03 kamil Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
@@ -433,9 +433,8 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 71 = compat_43_ommap */
{
- ns(struct sys_ovadvise_args),
- .sy_call = (sy_call_t *)sys_ovadvise
- }, /* 72 = vadvise */
+ .sy_call = sys_nosys,
+ }, /* 72 = filler */
{
ns(struct sys_munmap_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.308 src/sys/kern/syscalls.c:1.309
--- src/sys/kern/syscalls.c:1.308 Tue Dec 19 18:34:47 2017
+++ src/sys/kern/syscalls.c Tue Dec 19 19:40:03 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.308 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: syscalls.c,v 1.309 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.308 2017/12/19 18:34:47 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.309 2017/12/19 19:40:03 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
@@ -99,7 +99,7 @@ const char *const syscallnames[] = {
/* 69 */ "#69 (obsolete sbrk)",
/* 70 */ "#70 (obsolete sstk)",
/* 71 */ "compat_43_ommap",
- /* 72 */ "vadvise",
+ /* 72 */ "#72 (obsolete vadvise)",
/* 73 */ "munmap",
/* 74 */ "mprotect",
/* 75 */ "madvise",
@@ -636,7 +636,7 @@ const char *const altsyscallnames[] = {
/* 69 */ NULL, /* obsolete sbrk */
/* 70 */ NULL, /* obsolete sstk */
/* 71 */ NULL, /* compat_43_ommap */
- /* 72 */ "ovadvise",
+ /* 72 */ NULL, /* obsolete vadvise */
/* 73 */ NULL, /* munmap */
/* 74 */ NULL, /* mprotect */
/* 75 */ NULL, /* madvise */
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.289 src/sys/kern/syscalls.master:1.290
--- src/sys/kern/syscalls.master:1.289 Tue Dec 19 18:34:47 2017
+++ src/sys/kern/syscalls.master Tue Dec 19 19:40:03 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp $
+ $NetBSD: syscalls.master,v 1.290 2017/12/19 19:40:03 kamil Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -180,7 +180,7 @@
71 COMPAT_43 MODULAR compat \
{ int|sys||mmap(void *addr, size_t len, int prot, \
int flags, int fd, long pos); } ommap
-72 STD { int|sys||ovadvise(int anom); } vadvise
+72 OBSOL vadvise
73 STD { int|sys||munmap(void *addr, size_t len); }
74 STD { int|sys||mprotect(void *addr, size_t len, \
int prot); }
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.25 src/sys/kern/syscalls_autoload.c:1.26
--- src/sys/kern/syscalls_autoload.c:1.25 Fri Dec 8 01:20:53 2017
+++ src/sys/kern/syscalls_autoload.c Tue Dec 19 19:40:03 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.25 2017/12/08 01:20:53 christos Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.26 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.287 2017/12/08 01:19:29 christos Exp
+ * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.25 2017/12/08 01:20:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.26 2017/12/19 19:40:03 kamil Exp $");
#include <sys/proc.h>
static struct sc_autoload netbsd_syscalls_autoload[] = {
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.27 src/sys/kern/systrace_args.c:1.28
--- src/sys/kern/systrace_args.c:1.27 Tue Dec 19 18:34:47 2017
+++ src/sys/kern/systrace_args.c Tue Dec 19 19:40:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.27 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: systrace_args.c,v 1.28 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -534,13 +534,6 @@ systrace_args(register_t sysnum, const v
*n_args = 6;
break;
}
- /* sys_ovadvise */
- case 72: {
- const struct sys_ovadvise_args *p = params;
- iarg[0] = SCARG(p, anom); /* int */
- *n_args = 1;
- break;
- }
/* sys_munmap */
case 73: {
const struct sys_munmap_args *p = params;
@@ -4498,16 +4491,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* sys_ovadvise */
- case 72:
- switch(ndx) {
- case 0:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* sys_munmap */
case 73:
switch(ndx) {
@@ -10202,11 +10185,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* sys_ovadvise */
- case 72:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* sys_munmap */
case 73:
if (ndx == 0 || ndx == 1)
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.106 src/sys/rump/include/rump/rump_syscalls.h:1.107
--- src/sys/rump/include/rump/rump_syscalls.h:1.106 Fri Dec 8 01:20:53 2017
+++ src/sys/rump/include/rump/rump_syscalls.h Tue Dec 19 19:40:03 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.106 2017/12/08 01:20:53 christos Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.107 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.287 2017/12/08 01:19:29 christos Exp
+ * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.135 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.136
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.135 Tue Dec 19 18:34:47 2017
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Tue Dec 19 19:40:03 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.135 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.136 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.135 2017/12/19 18:34:47 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.136 2017/12/19 19:40:03 kamil Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -6789,8 +6789,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 71 = ommap */
{
+ .sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 72 = vadvise */
+ }, /* 72 = filler */
{
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 73 = munmap */
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.302 src/sys/sys/syscall.h:1.303
--- src/sys/sys/syscall.h:1.302 Tue Dec 19 18:34:47 2017
+++ src/sys/sys/syscall.h Tue Dec 19 19:40:03 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.302 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: syscall.h,v 1.303 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -218,9 +218,7 @@
/* syscall: "compat_43_ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define SYS_compat_43_ommap 71
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define SYS_vadvise 72
-
+ /* 72 is obsolete vadvise */
/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
#define SYS_munmap 73
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.286 src/sys/sys/syscallargs.h:1.287
--- src/sys/sys/syscallargs.h:1.286 Tue Dec 19 18:34:47 2017
+++ src/sys/sys/syscallargs.h Tue Dec 19 19:40:03 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.286 2017/12/19 18:34:47 kamil Exp $ */
+/* $NetBSD: syscallargs.h,v 1.287 2017/12/19 19:40:03 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -440,13 +440,6 @@ check_syscall_args(compat_43_sys_mmap)
#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
-struct sys_ovadvise_args {
- syscallarg(int) anom;
-};
-check_syscall_args(sys_ovadvise)
-#endif /* !RUMP_CLIENT */
-
-#ifndef RUMP_CLIENT
struct sys_munmap_args {
syscallarg(void *) addr;
syscallarg(size_t) len;
@@ -3286,8 +3279,6 @@ int sys_vfork(struct lwp *, const void *
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
-int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
-
int sys_munmap(struct lwp *, const struct sys_munmap_args *, register_t *);
int sys_mprotect(struct lwp *, const struct sys_mprotect_args *, register_t *);
Index: src/sys/uvm/uvm_unix.c
diff -u src/sys/uvm/uvm_unix.c:1.48 src/sys/uvm/uvm_unix.c:1.49
--- src/sys/uvm/uvm_unix.c:1.48 Sat May 6 21:34:52 2017
+++ src/sys/uvm/uvm_unix.c Tue Dec 19 19:40:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_unix.c,v 1.48 2017/05/06 21:34:52 joerg Exp $ */
+/* $NetBSD: uvm_unix.c,v 1.49 2017/12/19 19:40:03 kamil Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.48 2017/05/06 21:34:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.49 2017/12/19 19:40:03 kamil Exp $");
#include "opt_pax.h"
@@ -169,20 +169,3 @@ uvm_grow(struct proc *p, vaddr_t sp)
vm->vm_ssize = nss;
return (1);
}
-
-/*
- * sys_oadvise: old advice system call
- */
-
-/* ARGSUSED */
-int
-sys_ovadvise(struct lwp *l, const struct sys_ovadvise_args *uap, register_t *retval)
-{
-#if 0
- /* {
- syscallarg(int) anom;
- } */
-#endif
-
- return (EINVAL);
-}
