diff --git a/sys/compat/ultrix/syscalls.master b/sys/compat/ultrix/syscalls.master index ac9f998fbd3b..85e436907441 100644 --- a/sys/compat/ultrix/syscalls.master +++ b/sys/compat/ultrix/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp $ + $NetBSD: syscalls.master,v 1.55 2017/12/19 19:20:30 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 NOARGS { int|sys||ovadvise(int anom); } vadvise +72 OBSOL vadvise 73 NOARGS { int|sys||munmap(void *addr, size_t len); } 74 NOARGS { int|sys||mprotect(void *addr, size_t len, \ int prot); } diff --git a/sys/compat/ultrix/ultrix_syscall.h b/sys/compat/ultrix/ultrix_syscall.h index 891b003cfea9..2cd44e80aff6 100644 --- a/sys/compat/ultrix/ultrix_syscall.h +++ b/sys/compat/ultrix/ultrix_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscall.h,v 1.70 2017/12/19 18:20:11 kamil Exp $ */ +/* $NetBSD: ultrix_syscall.h,v 1.71 2017/12/19 19:20:30 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp */ #ifndef _ULTRIX_SYS_SYSCALL_H_ @@ -161,9 +161,7 @@ /* syscall: "mmap" ret: "int" args: "void *" "size_t" "int" "u_int" "int" "long" */ #define ULTRIX_SYS_mmap 71 -/* syscall: "vadvise" ret: "int" args: "int" */ -#define ULTRIX_SYS_vadvise 72 - + /* 72 is obsolete vadvise */ /* syscall: "munmap" ret: "int" args: "void *" "size_t" */ #define ULTRIX_SYS_munmap 73 diff --git a/sys/compat/ultrix/ultrix_syscallargs.h b/sys/compat/ultrix/ultrix_syscallargs.h index a6cd59359677..4dd79364f5d7 100644 --- a/sys/compat/ultrix/ultrix_syscallargs.h +++ b/sys/compat/ultrix/ultrix_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscallargs.h,v 1.65 2017/12/19 18:20:11 kamil Exp $ */ +/* $NetBSD: ultrix_syscallargs.h,v 1.66 2017/12/19 19:20:30 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp */ #ifndef _ULTRIX_SYS_SYSCALLARGS_H_ @@ -155,8 +155,6 @@ struct ultrix_sys_mmap_args { }; check_syscall_args(ultrix_sys_mmap) -struct sys_ovadvise_args; - struct sys_munmap_args; struct sys_mprotect_args; @@ -524,8 +522,6 @@ int sys_vfork(struct lwp *, const void *, register_t *); 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 *); diff --git a/sys/compat/ultrix/ultrix_syscalls.c b/sys/compat/ultrix/ultrix_syscalls.c index 8d2f724b3ffb..2a1cd63b5853 100644 --- a/sys/compat/ultrix/ultrix_syscalls.c +++ b/sys/compat/ultrix/ultrix_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $ */ +/* $NetBSD: ultrix_syscalls.c,v 1.70 2017/12/19 19:20:30 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.70 2017/12/19 19:20:30 kamil Exp $"); #if defined(_KERNEL_OPT) #include @@ -95,7 +95,7 @@ const char *const ultrix_syscallnames[] = { /* 69 */ "#69 (obsolete sbrk)", /* 70 */ "#70 (obsolete sstk)", /* 71 */ "mmap", - /* 72 */ "vadvise", + /* 72 */ "#72 (obsolete 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 */ "ovadvise", + /* 72 */ NULL, /* obsolete vadvise */ /* 73 */ NULL, /* munmap */ /* 74 */ NULL, /* mprotect */ /* 75 */ NULL, /* madvise */ diff --git a/sys/compat/ultrix/ultrix_sysent.c b/sys/compat/ultrix/ultrix_sysent.c index 08b4307a6abb..0d5aa3124023 100644 --- a/sys/compat/ultrix/ultrix_sysent.c +++ b/sys/compat/ultrix/ultrix_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: ultrix_sysent.c,v 1.72 2017/12/19 18:20:11 kamil Exp $ */ +/* $NetBSD: ultrix_sysent.c,v 1.73 2017/12/19 19:20:30 kamil Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp + * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_sysent.c,v 1.72 2017/12/19 18:20:11 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_sysent.c,v 1.73 2017/12/19 19:20:30 kamil Exp $"); #include #include @@ -298,9 +298,8 @@ struct sysent ultrix_sysent[] = { .sy_call = (sy_call_t *)ultrix_sys_mmap }, /* 71 = mmap */ { - 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,