Module Name: src Committed By: kamil Date: Sat Jan 6 16:41:24 UTC 2018
Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c syscalls.master src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c syscalls.master 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/compat/sunos: sunos_syscall.h sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c syscalls.master src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h sunos32_syscalls.c sunos32_sysent.c syscalls.master src/sys/compat/ultrix: syscalls.master ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c 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: Revert vadvise(2) removal This system call was used in legacy Lisp code, that was inherited to modern age and still compiled against supported compat layers (e.g. in clisp, oaklisp, Franz Lisp). It used to instruct the kernel about paging policy (G/C aware, flush etc). Newly compiled code (assuming that it will detect vadvise()) will use the libc stub for vadvise(). The headers for this interface are gone. vadvise(2) could be marked as COMPAT_80, but as long as we support ultrix, sunos or aout68k ABI, don't bother with this. Requested by <mrg> To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.49 -r1.50 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.48 -r1.49 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.53 -r1.54 src/sys/compat/aoutm68k/aoutm68k_sysent.c cvs rdiff -u -r1.40 -r1.41 src/sys/compat/aoutm68k/syscalls.master cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.90 -r1.91 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.88 -r1.89 src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.71 -r1.72 src/sys/compat/freebsd/syscalls.master cvs rdiff -u -r1.212 -r1.213 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.133 -r1.134 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.131 -r1.132 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.23 -r1.24 src/sys/compat/netbsd32/netbsd32_systrace_args.c cvs rdiff -u -r1.119 -r1.120 src/sys/compat/netbsd32/syscalls.master cvs rdiff -u -r1.95 -r1.96 src/sys/compat/sunos/sunos_syscall.h cvs rdiff -u -r1.79 -r1.80 src/sys/compat/sunos/sunos_syscallargs.h \ src/sys/compat/sunos/syscalls.master cvs rdiff -u -r1.94 -r1.95 src/sys/compat/sunos/sunos_syscalls.c cvs rdiff -u -r1.90 -r1.91 src/sys/compat/sunos/sunos_sysent.c cvs rdiff -u -r1.36 -r1.37 src/sys/compat/sunos32/sunos32_syscall.h cvs rdiff -u -r1.35 -r1.36 src/sys/compat/sunos32/sunos32_syscallargs.h \ src/sys/compat/sunos32/sunos32_syscalls.c cvs rdiff -u -r1.37 -r1.38 src/sys/compat/sunos32/sunos32_sysent.c cvs rdiff -u -r1.25 -r1.26 src/sys/compat/sunos32/syscalls.master cvs rdiff -u -r1.55 -r1.56 src/sys/compat/ultrix/syscalls.master cvs rdiff -u -r1.71 -r1.72 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.66 -r1.67 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.70 -r1.71 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.73 -r1.74 src/sys/compat/ultrix/ultrix_sysent.c cvs rdiff -u -r1.318 -r1.319 src/sys/kern/init_sysent.c cvs rdiff -u -r1.309 -r1.310 src/sys/kern/syscalls.c cvs rdiff -u -r1.290 -r1.291 src/sys/kern/syscalls.master cvs rdiff -u -r1.26 -r1.27 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.28 -r1.29 src/sys/kern/systrace_args.c cvs rdiff -u -r1.107 -r1.108 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.136 -r1.137 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.303 -r1.304 src/sys/sys/syscall.h cvs rdiff -u -r1.287 -r1.288 src/sys/sys/syscallargs.h cvs rdiff -u -r1.49 -r1.50 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/aoutm68k/aoutm68k_syscall.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.51 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.52 --- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.51 Tue Dec 19 19:17:17 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscall.h,v 1.51 2017/12/19 19:17:17 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscall.h,v 1.52 2018/01/06 16:41:23 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.39 2017/12/19 18:10:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp */ #ifndef _AOUTM68K_SYS_SYSCALL_H_ @@ -273,7 +273,9 @@ #else /* 71 is excluded compat_43_sys_mmap */ #endif - /* 72 is obsolete vadvise */ +/* syscall: "vadvise" ret: "int" args: "int" */ +#define AOUTM68K_SYS_vadvise 72 + /* syscall: "munmap" ret: "int" args: "void *" "size_t" */ #define AOUTM68K_SYS_munmap 73 Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.49 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.50 --- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.49 Tue Dec 19 19:17:17 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscallargs.h,v 1.49 2017/12/19 19:17:17 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscallargs.h,v 1.50 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.39 2017/12/19 18:10:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp */ #ifndef _AOUTM68K_SYS_SYSCALLARGS_H_ @@ -195,6 +195,8 @@ struct compat_43_sys_mmap_args; #else #endif +struct sys_ovadvise_args; + struct sys_munmap_args; struct sys_mprotect_args; @@ -821,6 +823,8 @@ int compat_43_sys_mmap(struct lwp *, con #else #endif +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/compat/aoutm68k/aoutm68k_syscalls.c diff -u src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.48 src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.49 --- src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.48 Tue Dec 19 19:17:17 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: aoutm68k_syscalls.c,v 1.48 2017/12/19 19:17:17 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscalls.c,v 1.49 2018/01/06 16:41:23 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.39 2017/12/19 18:10:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.48 2017/12/19 19:17:17 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.49 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -158,7 +158,7 @@ const char *const aoutm68k_syscallnames[ #else /* 71 */ "#71 (excluded compat_43_sys_mmap)", #endif - /* 72 */ "#72 (obsolete vadvise)", + /* 72 */ "vadvise", /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", @@ -905,7 +905,7 @@ const char *const altaoutm68k_syscallnam #else /* 71 */ NULL, /* excluded compat_43_sys_mmap */ #endif - /* 72 */ NULL, /* obsolete vadvise */ + /* 72 */ "ovadvise", /* 73 */ NULL, /* munmap */ /* 74 */ NULL, /* mprotect */ /* 75 */ NULL, /* madvise */ Index: src/sys/compat/aoutm68k/aoutm68k_sysent.c diff -u src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.53 src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.54 --- src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.53 Tue Dec 19 19:17:17 2017 +++ src/sys/compat/aoutm68k/aoutm68k_sysent.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: aoutm68k_sysent.c,v 1.53 2017/12/19 19:17:17 kamil Exp $ */ +/* $NetBSD: aoutm68k_sysent.c,v 1.54 2018/01/06 16:41:23 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.39 2017/12/19 18:10:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.53 2017/12/19 19:17:17 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.54 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #include "opt_ktrace.h" @@ -434,8 +434,9 @@ struct sysent aoutm68k_sysent[] = { }, /* 71 = filler */ #endif { - .sy_call = sys_nosys, - }, /* 72 = filler */ + ns(struct sys_ovadvise_args), + .sy_call = (sy_call_t *)sys_ovadvise + }, /* 72 = vadvise */ { ns(struct sys_munmap_args), .sy_flags = SYCALL_ARG_PTR, Index: src/sys/compat/aoutm68k/syscalls.master diff -u src/sys/compat/aoutm68k/syscalls.master:1.40 src/sys/compat/aoutm68k/syscalls.master:1.41 --- src/sys/compat/aoutm68k/syscalls.master:1.40 Tue Dec 19 19:17:17 2017 +++ src/sys/compat/aoutm68k/syscalls.master Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.40 2017/12/19 19:17:17 kamil Exp $ + $NetBSD: syscalls.master,v 1.41 2018/01/06 16:41:23 kamil Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -220,7 +220,7 @@ #else 71 EXCL compat_43_sys_mmap #endif -72 OBSOL vadvise +72 NOARGS { int|sys||ovadvise(int anom); } vadvise 73 NOARGS { int|sys||munmap(void *addr, size_t len); } 74 NOARGS { int|sys||mprotect(void *addr, size_t len, \ int prot); } Index: src/sys/compat/freebsd/freebsd_syscall.h diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.87 src/sys/compat/freebsd/freebsd_syscall.h:1.88 --- src/sys/compat/freebsd/freebsd_syscall.h:1.87 Tue Dec 19 19:18:18 2017 +++ src/sys/compat/freebsd/freebsd_syscall.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: freebsd_syscall.h,v 1.87 2017/12/19 19:18:18 kamil Exp $ */ +/* $NetBSD: freebsd_syscall.h,v 1.88 2018/01/06 16:41:23 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp + * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp */ #ifndef _FREEBSD_SYS_SYSCALL_H_ @@ -222,7 +222,9 @@ /* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */ #define FREEBSD_SYS_ommap 71 - /* 72 is obsolete vadvise */ +/* syscall: "vadvise" ret: "int" args: "int" */ +#define FREEBSD_SYS_vadvise 72 + /* syscall: "munmap" ret: "int" args: "void *" "size_t" */ #define FREEBSD_SYS_munmap 73 Index: src/sys/compat/freebsd/freebsd_syscallargs.h diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.90 src/sys/compat/freebsd/freebsd_syscallargs.h:1.91 --- src/sys/compat/freebsd/freebsd_syscallargs.h:1.90 Tue Dec 19 19:18:18 2017 +++ src/sys/compat/freebsd/freebsd_syscallargs.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: freebsd_syscallargs.h,v 1.90 2017/12/19 19:18:18 kamil Exp $ */ +/* $NetBSD: freebsd_syscallargs.h,v 1.91 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp + * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp */ #ifndef _FREEBSD_SYS_SYSCALLARGS_H_ @@ -167,6 +167,8 @@ check_syscall_args(freebsd_sys_msync) struct compat_43_sys_mmap_args; +struct sys_ovadvise_args; + struct sys_munmap_args; struct sys_mprotect_args; @@ -736,6 +738,8 @@ 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/compat/freebsd/freebsd_sysent.c diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.90 src/sys/compat/freebsd/freebsd_sysent.c:1.91 --- src/sys/compat/freebsd/freebsd_sysent.c:1.90 Tue Dec 19 19:18:18 2017 +++ src/sys/compat/freebsd/freebsd_sysent.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: freebsd_sysent.c,v 1.90 2017/12/19 19:18:18 kamil Exp $ */ +/* $NetBSD: freebsd_sysent.c,v 1.91 2018/01/06 16:41:23 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp + * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.90 2017/12/19 19:18:18 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.91 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #include "opt_ktrace.h" @@ -351,8 +351,9 @@ struct sysent freebsd_sysent[] = { .sy_call = (sy_call_t *)compat_43_sys_mmap }, /* 71 = ommap */ { - .sy_call = sys_nosys, - }, /* 72 = filler */ + ns(struct sys_ovadvise_args), + .sy_call = (sy_call_t *)sys_ovadvise + }, /* 72 = vadvise */ { ns(struct sys_munmap_args), .sy_flags = SYCALL_ARG_PTR, Index: src/sys/compat/freebsd/freebsd_syscalls.c diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.88 src/sys/compat/freebsd/freebsd_syscalls.c:1.89 --- src/sys/compat/freebsd/freebsd_syscalls.c:1.88 Tue Dec 19 19:18:18 2017 +++ src/sys/compat/freebsd/freebsd_syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: freebsd_syscalls.c,v 1.88 2017/12/19 19:18:18 kamil Exp $ */ +/* $NetBSD: freebsd_syscalls.c,v 1.89 2018/01/06 16:41:23 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp + * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.88 2017/12/19 19:18:18 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.89 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -107,7 +107,7 @@ const char *const freebsd_syscallnames[] /* 69 */ "#69 (obsolete sbrk)", /* 70 */ "#70 (obsolete sstk)", /* 71 */ "ommap", - /* 72 */ "#72 (obsolete vadvise)", + /* 72 */ "vadvise", /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", @@ -677,7 +677,7 @@ const char *const altfreebsd_syscallname /* 69 */ NULL, /* obsolete sbrk */ /* 70 */ NULL, /* obsolete sstk */ /* 71 */ "mmap", - /* 72 */ NULL, /* obsolete vadvise */ + /* 72 */ "ovadvise", /* 73 */ NULL, /* munmap */ /* 74 */ NULL, /* mprotect */ /* 75 */ NULL, /* madvise */ Index: src/sys/compat/freebsd/syscalls.master diff -u src/sys/compat/freebsd/syscalls.master:1.71 src/sys/compat/freebsd/syscalls.master:1.72 --- src/sys/compat/freebsd/syscalls.master:1.71 Tue Dec 19 19:18:18 2017 +++ src/sys/compat/freebsd/syscalls.master Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.71 2017/12/19 19:18:18 kamil Exp $ + $NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -161,7 +161,7 @@ 70 OBSOL sstk 71 NOARGS { int|compat_43_sys||mmap(void *addr, size_t len, \ int prot, int flags, int fd, long pos); } ommap -72 OBSOL vadvise +72 NOARGS { int|sys||ovadvise(int anom); } vadvise 73 NOARGS { int|sys||munmap(void *addr, size_t len); } 74 NOARGS { int|sys||mprotect(void *addr, size_t len, \ int prot); } Index: src/sys/compat/netbsd32/netbsd32_netbsd.c diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.212 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.213 --- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.212 Tue Dec 26 08:30:58 2017 +++ src/sys/compat/netbsd32/netbsd32_netbsd.c Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_netbsd.c,v 1.212 2017/12/26 08:30:58 kamil Exp $ */ +/* $NetBSD: netbsd32_netbsd.c,v 1.213 2018/01/06 16:41:23 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.212 2017/12/26 08:30:58 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.213 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -2006,6 +2006,17 @@ 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.133 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.133 Tue Dec 19 19:40:03 2017 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.133 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134 2018/01/06 16:41:23 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -218,7 +218,9 @@ /* 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 - /* 72 is obsolete vadvise */ +/* syscall: "vadvise" ret: "int" args: "int" */ +#define NETBSD32_SYS_vadvise 72 + /* 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.133 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.133 Tue Dec 19 19:40:03 2017 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.133 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -385,6 +385,11 @@ 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; @@ -2726,6 +2731,8 @@ 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.131 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.131 Tue Dec 19 19:40:03 2017 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.131 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132 2018/01/06 16:41:23 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.131 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132 2018/01/06 16:41:23 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 */ "#72 (obsolete vadvise)", + /* 72 */ "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 */ NULL, /* obsolete vadvise */ + /* 72 */ "ovadvise", /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.131 src/sys/compat/netbsd32/netbsd32_sysent.c:1.132 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.131 Tue Dec 19 19:40:03 2017 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.131 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.132 2018/01/06 16:41:23 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.131 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -391,8 +391,9 @@ struct sysent netbsd32_sysent[] = { .sy_call = (sy_call_t *)compat_43(netbsd32_ommap) }, /* 71 = compat_43_netbsd32_ommap */ { - .sy_call = sys_nosys, - }, /* 72 = filler */ + ns(struct netbsd32_ovadvise_args), + .sy_call = (sy_call_t *)netbsd32_ovadvise + }, /* 72 = vadvise */ { 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.12 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.12 Tue Dec 19 19:40:03 2017 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.12 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13 2018/01/06 16:41:23 kamil Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.118 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.115 2016/10/19 09:44:01 skrll Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.12 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13 2018/01/06 16:41:23 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.23 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.23 Tue Dec 19 19:40:03 2017 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.23 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.24 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument to DTrace register array converstion. @@ -534,6 +534,13 @@ 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; @@ -4277,6 +4284,16 @@ 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) { @@ -9618,6 +9635,11 @@ 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.119 src/sys/compat/netbsd32/syscalls.master:1.120 --- src/sys/compat/netbsd32/syscalls.master:1.119 Tue Dec 19 19:40:03 2017 +++ src/sys/compat/netbsd32/syscalls.master Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.119 2017/12/19 19:40:03 kamil Exp $ + $NetBSD: syscalls.master,v 1.120 2018/01/06 16:41:23 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 OBSOL vadvise +72 STD { int|netbsd32||ovadvise(int anom); } vadvise 73 STD { int|netbsd32||munmap(netbsd32_voidp addr, \ netbsd32_size_t len); } 74 STD { int|netbsd32||mprotect(netbsd32_voidp addr, \ Index: src/sys/compat/sunos/sunos_syscall.h diff -u src/sys/compat/sunos/sunos_syscall.h:1.95 src/sys/compat/sunos/sunos_syscall.h:1.96 --- src/sys/compat/sunos/sunos_syscall.h:1.95 Tue Dec 19 19:19:16 2017 +++ src/sys/compat/sunos/sunos_syscall.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: sunos_syscall.h,v 1.95 2017/12/19 19:19:16 kamil Exp $ */ +/* $NetBSD: sunos_syscall.h,v 1.96 2018/01/06 16:41:23 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.78 2017/12/19 18:24:21 kamil Exp + * created from NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp */ #ifndef _SUNOS_SYS_SYSCALL_H_ @@ -161,7 +161,9 @@ /* syscall: "mmap" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" */ #define SUNOS_SYS_mmap 71 - /* 72 is obsolete vadvise */ +/* syscall: "vadvise" ret: "int" args: "int" */ +#define SUNOS_SYS_vadvise 72 + /* syscall: "munmap" ret: "int" args: "void *" "size_t" */ #define SUNOS_SYS_munmap 73 Index: src/sys/compat/sunos/sunos_syscallargs.h diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.79 src/sys/compat/sunos/sunos_syscallargs.h:1.80 --- src/sys/compat/sunos/sunos_syscallargs.h:1.79 Tue Dec 19 19:19:16 2017 +++ src/sys/compat/sunos/sunos_syscallargs.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: sunos_syscallargs.h,v 1.79 2017/12/19 19:19:16 kamil Exp $ */ +/* $NetBSD: sunos_syscallargs.h,v 1.80 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.78 2017/12/19 18:24:21 kamil Exp + * created from NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp */ #ifndef _SUNOS_SYS_SYSCALLARGS_H_ @@ -177,6 +177,8 @@ struct sunos_sys_mmap_args { }; check_syscall_args(sunos_sys_mmap) +struct sys_ovadvise_args; + struct sys_munmap_args; struct sys_mprotect_args; @@ -550,6 +552,8 @@ int sys_vfork(struct lwp *, const void * int sunos_sys_mmap(struct lwp *, const struct sunos_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/compat/sunos/syscalls.master diff -u src/sys/compat/sunos/syscalls.master:1.79 src/sys/compat/sunos/syscalls.master:1.80 --- src/sys/compat/sunos/syscalls.master:1.79 Tue Dec 19 19:19:16 2017 +++ src/sys/compat/sunos/syscalls.master Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.79 2017/12/19 19:19:16 kamil Exp $ + $NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -132,7 +132,7 @@ 70 OBSOL sstk 71 STD { void *|sunos_sys||mmap(void *addr, size_t len, \ int prot, int flags, int fd, long pos); } -72 OBSOL vadvise +72 NOARGS { int|sys||ovadvise(int anom); } vadvise 73 NOARGS { int|sys||munmap(void *addr, size_t len); } 74 NOARGS { int|sys||mprotect(void *addr, size_t len, \ int prot); } Index: src/sys/compat/sunos/sunos_syscalls.c diff -u src/sys/compat/sunos/sunos_syscalls.c:1.94 src/sys/compat/sunos/sunos_syscalls.c:1.95 --- src/sys/compat/sunos/sunos_syscalls.c:1.94 Tue Dec 19 19:19:16 2017 +++ src/sys/compat/sunos/sunos_syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: sunos_syscalls.c,v 1.94 2017/12/19 19:19:16 kamil Exp $ */ +/* $NetBSD: sunos_syscalls.c,v 1.95 2018/01/06 16:41:23 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.78 2017/12/19 18:24:21 kamil Exp + * created from NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.94 2017/12/19 19:19:16 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -100,7 +100,7 @@ const char *const sunos_syscallnames[] = /* 69 */ "#69 (obsolete sbrk)", /* 70 */ "#70 (obsolete sstk)", /* 71 */ "mmap", - /* 72 */ "#72 (obsolete vadvise)", + /* 72 */ "vadvise", /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", @@ -373,7 +373,7 @@ const char *const altsunos_syscallnames[ /* 69 */ NULL, /* obsolete sbrk */ /* 70 */ NULL, /* obsolete sstk */ /* 71 */ NULL, /* mmap */ - /* 72 */ NULL, /* obsolete vadvise */ + /* 72 */ "ovadvise", /* 73 */ NULL, /* munmap */ /* 74 */ NULL, /* mprotect */ /* 75 */ NULL, /* madvise */ Index: src/sys/compat/sunos/sunos_sysent.c diff -u src/sys/compat/sunos/sunos_sysent.c:1.90 src/sys/compat/sunos/sunos_sysent.c:1.91 --- src/sys/compat/sunos/sunos_sysent.c:1.90 Tue Dec 19 19:19:16 2017 +++ src/sys/compat/sunos/sunos_sysent.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: sunos_sysent.c,v 1.90 2017/12/19 19:19:16 kamil Exp $ */ +/* $NetBSD: sunos_sysent.c,v 1.91 2018/01/06 16:41:23 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.78 2017/12/19 18:24:21 kamil Exp + * created from NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos_sysent.c,v 1.90 2017/12/19 19:19:16 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos_sysent.c,v 1.91 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -313,8 +313,9 @@ struct sysent sunos_sysent[] = { .sy_call = (sy_call_t *)sunos_sys_mmap }, /* 71 = mmap */ { - .sy_call = sys_nosys, - }, /* 72 = filler */ + ns(struct sys_ovadvise_args), + .sy_call = (sy_call_t *)sys_ovadvise + }, /* 72 = vadvise */ { ns(struct sys_munmap_args), .sy_flags = SYCALL_ARG_PTR, Index: src/sys/compat/sunos32/sunos32_syscall.h diff -u src/sys/compat/sunos32/sunos32_syscall.h:1.36 src/sys/compat/sunos32/sunos32_syscall.h:1.37 --- src/sys/compat/sunos32/sunos32_syscall.h:1.36 Tue Dec 19 19:19:50 2017 +++ src/sys/compat/sunos32/sunos32_syscall.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: sunos32_syscall.h,v 1.36 2017/12/19 19:19:50 kamil Exp $ */ +/* $NetBSD: sunos32_syscall.h,v 1.37 2018/01/06 16:41:23 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp + * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp */ #ifndef _SUNOS32_SYS_SYSCALL_H_ @@ -161,7 +161,9 @@ /* syscall: "mmap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" */ #define SUNOS32_SYS_mmap 71 - /* 72 is obsolete vadvise */ +/* syscall: "vadvise" ret: "int" args: "int" */ +#define SUNOS32_SYS_vadvise 72 + /* syscall: "netbsd32_munmap" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */ #define SUNOS32_SYS_netbsd32_munmap 73 Index: src/sys/compat/sunos32/sunos32_syscallargs.h diff -u src/sys/compat/sunos32/sunos32_syscallargs.h:1.35 src/sys/compat/sunos32/sunos32_syscallargs.h:1.36 --- src/sys/compat/sunos32/sunos32_syscallargs.h:1.35 Tue Dec 19 19:19:50 2017 +++ src/sys/compat/sunos32/sunos32_syscallargs.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: sunos32_syscallargs.h,v 1.35 2017/12/19 19:19:50 kamil Exp $ */ +/* $NetBSD: sunos32_syscallargs.h,v 1.36 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp + * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp */ #ifndef _SUNOS32_SYS_SYSCALLARGS_H_ @@ -189,6 +189,8 @@ struct sunos32_sys_mmap_args { }; check_syscall_args(sunos32_sys_mmap) +struct netbsd32_ovadvise_args; + struct netbsd32_munmap_args; struct netbsd32_mprotect_args; @@ -562,6 +564,8 @@ int sys_vfork(struct lwp *, const void * int sunos32_sys_mmap(struct lwp *, const struct sunos32_sys_mmap_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/sunos32/sunos32_syscalls.c diff -u src/sys/compat/sunos32/sunos32_syscalls.c:1.35 src/sys/compat/sunos32/sunos32_syscalls.c:1.36 --- src/sys/compat/sunos32/sunos32_syscalls.c:1.35 Tue Dec 19 19:19:50 2017 +++ src/sys/compat/sunos32/sunos32_syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: sunos32_syscalls.c,v 1.35 2017/12/19 19:19:50 kamil Exp $ */ +/* $NetBSD: sunos32_syscalls.c,v 1.36 2018/01/06 16:41:23 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp + * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.35 2017/12/19 19:19:50 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.36 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -104,7 +104,7 @@ const char *const sunos32_syscallnames[] /* 69 */ "#69 (obsolete sbrk)", /* 70 */ "#70 (obsolete sstk)", /* 71 */ "mmap", - /* 72 */ "#72 (obsolete vadvise)", + /* 72 */ "vadvise", /* 73 */ "netbsd32_munmap", /* 74 */ "netbsd32_mprotect", /* 75 */ "netbsd32_madvise", @@ -377,7 +377,7 @@ const char *const altsunos32_syscallname /* 69 */ NULL, /* obsolete sbrk */ /* 70 */ NULL, /* obsolete sstk */ /* 71 */ NULL, /* mmap */ - /* 72 */ NULL, /* obsolete vadvise */ + /* 72 */ "ovadvise", /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", Index: src/sys/compat/sunos32/sunos32_sysent.c diff -u src/sys/compat/sunos32/sunos32_sysent.c:1.37 src/sys/compat/sunos32/sunos32_sysent.c:1.38 --- src/sys/compat/sunos32/sunos32_sysent.c:1.37 Tue Dec 19 19:19:50 2017 +++ src/sys/compat/sunos32/sunos32_sysent.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: sunos32_sysent.c,v 1.37 2017/12/19 19:19:50 kamil Exp $ */ +/* $NetBSD: sunos32_sysent.c,v 1.38 2018/01/06 16:41:23 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp + * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.37 2017/12/19 19:19:50 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.38 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -287,8 +287,9 @@ struct sysent sunos32_sysent[] = { .sy_call = (sy_call_t *)sunos32_sys_mmap }, /* 71 = mmap */ { - .sy_call = sys_nosys, - }, /* 72 = filler */ + ns(struct netbsd32_ovadvise_args), + .sy_call = (sy_call_t *)netbsd32_ovadvise + }, /* 72 = vadvise */ { ns(struct netbsd32_munmap_args), .sy_call = (sy_call_t *)netbsd32_munmap Index: src/sys/compat/sunos32/syscalls.master diff -u src/sys/compat/sunos32/syscalls.master:1.25 src/sys/compat/sunos32/syscalls.master:1.26 --- src/sys/compat/sunos32/syscalls.master:1.25 Tue Dec 19 19:19:50 2017 +++ src/sys/compat/sunos32/syscalls.master Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ -; $NetBSD: syscalls.master,v 1.25 2017/12/19 19:19:50 kamil Exp $ +; $NetBSD: syscalls.master,v 1.26 2018/01/06 16:41:23 kamil Exp $ ; from :NetBSD: syscalls.master,v 1.57 2000/12/09 07:10:36 mycroft Exp @@ -138,7 +138,7 @@ 70 OBSOL sstk 71 STD { netbsd32_voidp|sunos32_sys||mmap(netbsd32_voidp addr, netbsd32_size_t len, \ int prot, int flags, int fd, netbsd32_long pos); } -72 OBSOL vadvise +72 NOARGS { int|netbsd32||ovadvise(int anom); } vadvise 73 NOARGS { int|netbsd32||munmap(netbsd32_voidp addr, netbsd32_size_t len); } 74 NOARGS { int|netbsd32||mprotect(netbsd32_voidp addr, netbsd32_size_t len, \ int prot); } Index: src/sys/compat/ultrix/syscalls.master diff -u src/sys/compat/ultrix/syscalls.master:1.55 src/sys/compat/ultrix/syscalls.master:1.56 --- src/sys/compat/ultrix/syscalls.master:1.55 Tue Dec 19 19:20:30 2017 +++ src/sys/compat/ultrix/syscalls.master Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.55 2017/12/19 19:20:30 kamil Exp $ + $NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -122,7 +122,7 @@ 70 OBSOL sstk 71 STD { int|ultrix_sys||mmap(void *addr, size_t len, \ int prot, u_int flags, int fd, long pos); } -72 OBSOL vadvise +72 NOARGS { int|sys||ovadvise(int anom); } vadvise 73 NOARGS { int|sys||munmap(void *addr, size_t len); } 74 NOARGS { int|sys||mprotect(void *addr, size_t len, \ int prot); } Index: src/sys/compat/ultrix/ultrix_syscall.h diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.71 src/sys/compat/ultrix/ultrix_syscall.h:1.72 --- src/sys/compat/ultrix/ultrix_syscall.h:1.71 Tue Dec 19 19:20:30 2017 +++ src/sys/compat/ultrix/ultrix_syscall.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscall.h,v 1.71 2017/12/19 19:20:30 kamil Exp $ */ +/* $NetBSD: ultrix_syscall.h,v 1.72 2018/01/06 16:41:23 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp + * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp */ #ifndef _ULTRIX_SYS_SYSCALL_H_ @@ -161,7 +161,9 @@ /* syscall: "mmap" ret: "int" args: "void *" "size_t" "int" "u_int" "int" "long" */ #define ULTRIX_SYS_mmap 71 - /* 72 is obsolete vadvise */ +/* syscall: "vadvise" ret: "int" args: "int" */ +#define ULTRIX_SYS_vadvise 72 + /* syscall: "munmap" ret: "int" args: "void *" "size_t" */ #define ULTRIX_SYS_munmap 73 Index: src/sys/compat/ultrix/ultrix_syscallargs.h diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.66 src/sys/compat/ultrix/ultrix_syscallargs.h:1.67 --- src/sys/compat/ultrix/ultrix_syscallargs.h:1.66 Tue Dec 19 19:20:30 2017 +++ src/sys/compat/ultrix/ultrix_syscallargs.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscallargs.h,v 1.66 2017/12/19 19:20:30 kamil Exp $ */ +/* $NetBSD: ultrix_syscallargs.h,v 1.67 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp + * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp */ #ifndef _ULTRIX_SYS_SYSCALLARGS_H_ @@ -155,6 +155,8 @@ struct ultrix_sys_mmap_args { }; check_syscall_args(ultrix_sys_mmap) +struct sys_ovadvise_args; + struct sys_munmap_args; struct sys_mprotect_args; @@ -522,6 +524,8 @@ int sys_vfork(struct lwp *, const void * int ultrix_sys_mmap(struct lwp *, const struct ultrix_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/compat/ultrix/ultrix_syscalls.c diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.70 src/sys/compat/ultrix/ultrix_syscalls.c:1.71 --- src/sys/compat/ultrix/ultrix_syscalls.c:1.70 Tue Dec 19 19:20:30 2017 +++ src/sys/compat/ultrix/ultrix_syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: ultrix_syscalls.c,v 1.70 2017/12/19 19:20:30 kamil Exp $ */ +/* $NetBSD: ultrix_syscalls.c,v 1.71 2018/01/06 16:41:23 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp + * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.70 2017/12/19 19:20:30 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.71 2018/01/06 16:41:23 kamil Exp $"); #if defined(_KERNEL_OPT) #include <sys/param.h> @@ -95,7 +95,7 @@ const char *const ultrix_syscallnames[] /* 69 */ "#69 (obsolete sbrk)", /* 70 */ "#70 (obsolete sstk)", /* 71 */ "mmap", - /* 72 */ "#72 (obsolete vadvise)", + /* 72 */ "vadvise", /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", @@ -617,7 +617,7 @@ const char *const altultrix_syscallnames /* 69 */ NULL, /* obsolete sbrk */ /* 70 */ NULL, /* obsolete sstk */ /* 71 */ NULL, /* mmap */ - /* 72 */ NULL, /* obsolete vadvise */ + /* 72 */ "ovadvise", /* 73 */ NULL, /* munmap */ /* 74 */ NULL, /* mprotect */ /* 75 */ NULL, /* madvise */ Index: src/sys/compat/ultrix/ultrix_sysent.c diff -u src/sys/compat/ultrix/ultrix_sysent.c:1.73 src/sys/compat/ultrix/ultrix_sysent.c:1.74 --- src/sys/compat/ultrix/ultrix_sysent.c:1.73 Tue Dec 19 19:20:30 2017 +++ src/sys/compat/ultrix/ultrix_sysent.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: ultrix_sysent.c,v 1.73 2017/12/19 19:20:30 kamil Exp $ */ +/* $NetBSD: ultrix_sysent.c,v 1.74 2018/01/06 16:41:23 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp + * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ultrix_sysent.c,v 1.73 2017/12/19 19:20:30 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_sysent.c,v 1.74 2018/01/06 16:41:23 kamil Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -298,8 +298,9 @@ struct sysent ultrix_sysent[] = { .sy_call = (sy_call_t *)ultrix_sys_mmap }, /* 71 = mmap */ { - .sy_call = sys_nosys, - }, /* 72 = filler */ + ns(struct sys_ovadvise_args), + .sy_call = (sy_call_t *)sys_ovadvise + }, /* 72 = vadvise */ { ns(struct sys_munmap_args), .sy_flags = SYCALL_ARG_PTR, Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.318 src/sys/kern/init_sysent.c:1.319 --- src/sys/kern/init_sysent.c:1.318 Tue Dec 19 19:40:03 2017 +++ src/sys/kern/init_sysent.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.318 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: init_sysent.c,v 1.319 2018/01/06 16:41:23 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.318 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.319 2018/01/06 16:41:23 kamil Exp $"); #include "opt_modular.h" #include "opt_ntp.h" @@ -433,8 +433,9 @@ struct sysent sysent[] = { .sy_call = (sy_call_t *)sys_nomodule }, /* 71 = compat_43_ommap */ { - .sy_call = sys_nosys, - }, /* 72 = filler */ + ns(struct sys_ovadvise_args), + .sy_call = (sy_call_t *)sys_ovadvise + }, /* 72 = vadvise */ { ns(struct sys_munmap_args), .sy_flags = SYCALL_ARG_PTR, Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.309 src/sys/kern/syscalls.c:1.310 --- src/sys/kern/syscalls.c:1.309 Tue Dec 19 19:40:03 2017 +++ src/sys/kern/syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.309 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: syscalls.c,v 1.310 2018/01/06 16:41:23 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.309 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.310 2018/01/06 16:41:23 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 */ "#72 (obsolete vadvise)", + /* 72 */ "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 */ NULL, /* obsolete vadvise */ + /* 72 */ "ovadvise", /* 73 */ NULL, /* munmap */ /* 74 */ NULL, /* mprotect */ /* 75 */ NULL, /* madvise */ Index: src/sys/kern/syscalls.master diff -u src/sys/kern/syscalls.master:1.290 src/sys/kern/syscalls.master:1.291 --- src/sys/kern/syscalls.master:1.290 Tue Dec 19 19:40:03 2017 +++ src/sys/kern/syscalls.master Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.290 2017/12/19 19:40:03 kamil Exp $ + $NetBSD: syscalls.master,v 1.291 2018/01/06 16:41:23 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 OBSOL vadvise +72 STD { int|sys||ovadvise(int anom); } 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.26 src/sys/kern/syscalls_autoload.c:1.27 --- src/sys/kern/syscalls_autoload.c:1.26 Tue Dec 19 19:40:03 2017 +++ src/sys/kern/syscalls_autoload.c Sat Jan 6 16:41:23 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.26 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.27 2018/01/06 16:41:23 kamil Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.287 2017/12/08 01:19:29 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.26 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.27 2018/01/06 16:41:23 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.28 src/sys/kern/systrace_args.c:1.29 --- src/sys/kern/systrace_args.c:1.28 Tue Dec 19 19:40:03 2017 +++ src/sys/kern/systrace_args.c Sat Jan 6 16:41:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.28 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: systrace_args.c,v 1.29 2018/01/06 16:41:23 kamil Exp $ */ /* * System call argument to DTrace register array converstion. @@ -534,6 +534,13 @@ 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; @@ -4491,6 +4498,16 @@ 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) { @@ -10185,6 +10202,11 @@ 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.107 src/sys/rump/include/rump/rump_syscalls.h:1.108 --- src/sys/rump/include/rump/rump_syscalls.h:1.107 Tue Dec 19 19:40:03 2017 +++ src/sys/rump/include/rump/rump_syscalls.h Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.107 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.108 2018/01/06 16:41:23 kamil Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.287 2017/12/08 01:19:29 christos 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.136 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.137 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.136 Tue Dec 19 19:40:03 2017 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sat Jan 6 16:41:23 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.136 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.137 2018/01/06 16:41:23 kamil Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.136 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.137 2018/01/06 16:41:23 kamil Exp $"); #include <sys/fstypes.h> #include <sys/proc.h> @@ -6789,9 +6789,8 @@ 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 = filler */ +}, /* 72 = vadvise */ { .sy_call = (sy_call_t *)rumpns_enosys, }, /* 73 = munmap */ Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.303 src/sys/sys/syscall.h:1.304 --- src/sys/sys/syscall.h:1.303 Tue Dec 19 19:40:03 2017 +++ src/sys/sys/syscall.h Sat Jan 6 16:41:24 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.303 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: syscall.h,v 1.304 2018/01/06 16:41:24 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp */ #ifndef _SYS_SYSCALL_H_ @@ -218,7 +218,9 @@ /* syscall: "compat_43_ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */ #define SYS_compat_43_ommap 71 - /* 72 is obsolete vadvise */ +/* syscall: "vadvise" ret: "int" args: "int" */ +#define SYS_vadvise 72 + /* 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.287 src/sys/sys/syscallargs.h:1.288 --- src/sys/sys/syscallargs.h:1.287 Tue Dec 19 19:40:03 2017 +++ src/sys/sys/syscallargs.h Sat Jan 6 16:41:24 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.287 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: syscallargs.h,v 1.288 2018/01/06 16:41:24 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.289 2017/12/19 18:34:47 kamil Exp + * created from NetBSD: syscalls.master,v 1.288 2017/12/19 08:48:19 kamil Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -440,6 +440,13 @@ 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; @@ -3279,6 +3286,8 @@ 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.49 src/sys/uvm/uvm_unix.c:1.50 --- src/sys/uvm/uvm_unix.c:1.49 Tue Dec 19 19:40:03 2017 +++ src/sys/uvm/uvm_unix.c Sat Jan 6 16:41:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_unix.c,v 1.49 2017/12/19 19:40:03 kamil Exp $ */ +/* $NetBSD: uvm_unix.c,v 1.50 2018/01/06 16:41:24 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.49 2017/12/19 19:40:03 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.50 2018/01/06 16:41:24 kamil Exp $"); #include "opt_pax.h" @@ -169,3 +169,20 @@ 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); +}