From 3805245bdbdd22f1e29753d2209b46d6db2ca1b8 Mon Sep 17 00:00:00 2001 From: kamil Date: Tue, 19 Dec 2017 19:19:50 +0000 Subject: [PATCH] compat/sunos32: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by --- sys/compat/sunos32/sunos32_syscall.h | 8 +++----- sys/compat/sunos32/sunos32_syscallargs.h | 8 ++------ sys/compat/sunos32/sunos32_syscalls.c | 10 +++++----- sys/compat/sunos32/sunos32_sysent.c | 11 +++++------ sys/compat/sunos32/syscalls.master | 4 ++-- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/sys/compat/sunos32/sunos32_syscall.h b/sys/compat/sunos32/sunos32_syscall.h index d56268597b37..8ee697c6bbe7 100644 --- a/sys/compat/sunos32/sunos32_syscall.h +++ b/sys/compat/sunos32/sunos32_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: sunos32_syscall.h,v 1.35 2017/12/19 18:25:53 kamil Exp $ */ +/* $NetBSD: sunos32_syscall.h,v 1.36 2017/12/19 19:19:50 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp + * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp */ #ifndef _SUNOS32_SYS_SYSCALL_H_ @@ -161,9 +161,7 @@ /* syscall: "mmap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" */ #define SUNOS32_SYS_mmap 71 -/* syscall: "vadvise" ret: "int" args: "int" */ -#define SUNOS32_SYS_vadvise 72 - + /* 72 is obsolete vadvise */ /* syscall: "netbsd32_munmap" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */ #define SUNOS32_SYS_netbsd32_munmap 73 diff --git a/sys/compat/sunos32/sunos32_syscallargs.h b/sys/compat/sunos32/sunos32_syscallargs.h index 62647f7756d3..d2d8203f710e 100644 --- a/sys/compat/sunos32/sunos32_syscallargs.h +++ b/sys/compat/sunos32/sunos32_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: sunos32_syscallargs.h,v 1.34 2017/12/19 18:25:53 kamil Exp $ */ +/* $NetBSD: sunos32_syscallargs.h,v 1.35 2017/12/19 19:19:50 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp + * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp */ #ifndef _SUNOS32_SYS_SYSCALLARGS_H_ @@ -189,8 +189,6 @@ struct sunos32_sys_mmap_args { }; check_syscall_args(sunos32_sys_mmap) -struct netbsd32_ovadvise_args; - struct netbsd32_munmap_args; struct netbsd32_mprotect_args; @@ -564,8 +562,6 @@ int sys_vfork(struct lwp *, const void *, register_t *); 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 *); diff --git a/sys/compat/sunos32/sunos32_syscalls.c b/sys/compat/sunos32/sunos32_syscalls.c index 3b38ccd61dd5..134a8a21baa4 100644 --- a/sys/compat/sunos32/sunos32_syscalls.c +++ b/sys/compat/sunos32/sunos32_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: sunos32_syscalls.c,v 1.34 2017/12/19 18:25:53 kamil Exp $ */ +/* $NetBSD: sunos32_syscalls.c,v 1.35 2017/12/19 19:19:50 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp + * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.34 2017/12/19 18:25:53 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.35 2017/12/19 19:19:50 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 */ "vadvise", + /* 72 */ "#72 (obsolete vadvise)", /* 73 */ "netbsd32_munmap", /* 74 */ "netbsd32_mprotect", /* 75 */ "netbsd32_madvise", @@ -377,7 +377,7 @@ const char *const altsunos32_syscallnames[] = { /* 69 */ NULL, /* obsolete sbrk */ /* 70 */ NULL, /* obsolete sstk */ /* 71 */ NULL, /* mmap */ - /* 72 */ "ovadvise", + /* 72 */ NULL, /* obsolete vadvise */ /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", diff --git a/sys/compat/sunos32/sunos32_sysent.c b/sys/compat/sunos32/sunos32_sysent.c index 1566cb514735..2d9fb84bc959 100644 --- a/sys/compat/sunos32/sunos32_sysent.c +++ b/sys/compat/sunos32/sunos32_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: sunos32_sysent.c,v 1.36 2017/12/19 18:25:53 kamil Exp $ */ +/* $NetBSD: sunos32_sysent.c,v 1.37 2017/12/19 19:19:50 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp + * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.36 2017/12/19 18:25:53 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.37 2017/12/19 19:19:50 kamil Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -287,9 +287,8 @@ struct sysent sunos32_sysent[] = { .sy_call = (sy_call_t *)sunos32_sys_mmap }, /* 71 = mmap */ { - 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 diff --git a/sys/compat/sunos32/syscalls.master b/sys/compat/sunos32/syscalls.master index 30667c0f1719..5e14f0b844e1 100644 --- a/sys/compat/sunos32/syscalls.master +++ b/sys/compat/sunos32/syscalls.master @@ -1,4 +1,4 @@ -; $NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp $ +; $NetBSD: syscalls.master,v 1.25 2017/12/19 19:19:50 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 NOARGS { int|netbsd32||ovadvise(int anom); } vadvise +72 OBSOL 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); }