CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: pgoyette Date: Sun Mar 3 22:26:58 UTC 2019 Modified Files: src/sys/compat/ultrix: ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.73 -r1.74 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.76 -r1.77 src/sys/compat/ultrix/ultrix_sysent.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/ultrix/ultrix_syscall.h diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.74 src/sys/compat/ultrix/ultrix_syscall.h:1.75 --- src/sys/compat/ultrix/ultrix_syscall.h:1.74 Sun Jan 27 02:08:41 2019 +++ src/sys/compat/ultrix/ultrix_syscall.h Sun Mar 3 22:26:58 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscall.h,v 1.74 2019/01/27 02:08:41 pgoyette Exp $ */ +/* $NetBSD: ultrix_syscall.h,v 1.75 2019/03/03 22:26:58 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp */ #ifndef _ULTRIX_SYS_SYSCALL_H_ @@ -387,15 +387,12 @@ /* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */ #define ULTRIX_SYS_getfh 164 -#if defined(COMPAT_09) /* syscall: "getdomainname" ret: "int" args: "char *" "int" */ #define ULTRIX_SYS_getdomainname 165 /* syscall: "setdomainname" ret: "int" args: "char *" "int" */ #define ULTRIX_SYS_setdomainname 166 -#else -#endif /* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "void *" */ #define ULTRIX_SYS_quotactl 168 Index: src/sys/compat/ultrix/ultrix_syscallargs.h diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.69 src/sys/compat/ultrix/ultrix_syscallargs.h:1.70 --- src/sys/compat/ultrix/ultrix_syscallargs.h:1.69 Sun Jan 27 02:08:41 2019 +++ src/sys/compat/ultrix/ultrix_syscallargs.h Sun Mar 3 22:26:58 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscallargs.h,v 1.69 2019/01/27 02:08:41 pgoyette Exp $ */ +/* $NetBSD: ultrix_syscallargs.h,v 1.70 2019/03/03 22:26:58 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp */ #ifndef _ULTRIX_SYS_SYSCALLARGS_H_ @@ -357,13 +357,10 @@ struct ultrix_sys_fstatfs_args { check_syscall_args(ultrix_sys_fstatfs) struct compat_30_sys_getfh_args; -#if defined(COMPAT_09) struct compat_09_sys_getdomainname_args; struct compat_09_sys_setdomainname_args; -#else -#endif struct ultrix_sys_quotactl_args { syscallarg(int) cmd; @@ -678,13 +675,10 @@ int ultrix_sys_fstatfs(struct lwp *, con int compat_30_sys_getfh(struct lwp *, const struct compat_30_sys_getfh_args *, register_t *); -#if defined(COMPAT_09) int compat_09_sys_getdomainname(struct lwp *, const struct compat_09_sys_getdomainname_args *, register_t *); int compat_09_sys_setdomainname(struct lwp *, const struct compat_09_sys_setdomainname_args *, register_t *); -#else -#endif int ultrix_sys_quotactl(struct lwp *, const struct ultrix_sys_quotactl_args *, register_t *); int ultrix_sys_exportfs(struct lwp *, const struct ultrix_sys_exportfs_args *, register_t *); Index: src/sys/compat/ultrix/ultrix_syscalls.c diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.73 src/sys/compat/ultrix/ultrix_syscalls.c:1.74 --- src/sys/compat/ultrix/ultrix_syscalls.c:1.73 Sun Jan 27 02:08:41 2019 +++ src/sys/compat/ultrix/ultrix_syscalls.c Sun Mar 3 22:26:58 2019 @@ -1,14 +1,14 @@ -/* $NetBSD: ultrix_syscalls.c,v 1.73 2019/01/27 02:08:41 pgoyette Exp $ */ +/* $NetBSD: ultrix_syscalls.c,v 1.74 2019/03/03 22:26:58 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.73 2019/01/27 02:08:41 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.74 2019/03/03 22:26:58 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include @@ -193,13 +193,8 @@ const char *const ultrix_syscallnames[] /* 162 */ "#162 (unimplemented umount)", /* 163 */ "#163 (unimplemented async_daemon)", /* 164 */ "getfh", -#if defined(COMPAT_09) /* 165 */ "getdomainname", /* 166 */ "setdomainname", -#else - /* 165 */ "#165 (unimplemented compat_09_sys_getdomainname)", - /* 166 */ "#166 (unimplemented compat_09_sys_setdomainname)", -#endif /* 167 */ "#167
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: pgoyette Date: Sun Mar 3 22:26:30 UTC 2019 Modified Files: src/sys/compat/ultrix: syscalls.master Log Message: The compat_09_{get,set}domainname() syscalls should not be defined based on existence of COMPAT_09. Make them modular instead, and reference the compat_09 module. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/compat/ultrix/syscalls.master 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/ultrix/syscalls.master diff -u src/sys/compat/ultrix/syscalls.master:1.57 src/sys/compat/ultrix/syscalls.master:1.58 --- src/sys/compat/ultrix/syscalls.master:1.57 Sun Jan 27 02:08:41 2019 +++ src/sys/compat/ultrix/syscalls.master Sun Mar 3 22:26:30 2019 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.57 2019/01/27 02:08:41 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -255,15 +255,12 @@ 162 UNIMPL umount 163 UNIMPL async_daemon 164 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); } -#if defined(COMPAT_09) -165 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \ +165 NOARGS MODULAR compat_09 \ + { int|compat_09_sys||getdomainname(char *domainname, \ int len); } -166 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \ +166 NOARGS MODULAR compat_09 \ + { int|compat_09_sys||setdomainname(char *domainname, \ int len); } -#else -165 UNIMPL compat_09_sys_getdomainname -166 UNIMPL compat_09_sys_setdomainname -#endif 167 UNIMPL 168 STD { int|ultrix_sys||quotactl(int cmd, char *special, \ int uid, void *addr); }
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: pgoyette Date: Sun Mar 3 22:25:00 UTC 2019 Modified Files: src/sys/compat/ultrix: ultrix_mod.c Log Message: Fix the required-list for compat_ultrix. With the merge of the [pgoyette-compat] branch there is no longer a "compat" module; instead we have lots of version-specific compat_xx modules. Code inspection shows compat_ultrix uses compat_13 (and newer) stuff, so set the requirements list accordingly. Should fix PR port-pmax/54037 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/ultrix/ultrix_mod.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/ultrix/ultrix_mod.c diff -u src/sys/compat/ultrix/ultrix_mod.c:1.5 src/sys/compat/ultrix/ultrix_mod.c:1.6 --- src/sys/compat/ultrix/ultrix_mod.c:1.5 Fri Mar 7 01:33:44 2014 +++ src/sys/compat/ultrix/ultrix_mod.c Sun Mar 3 22:25:00 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_mod.c,v 1.5 2014/03/07 01:33:44 christos Exp $ */ +/* $NetBSD: ultrix_mod.c,v 1.6 2019/03/03 22:25:00 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.5 2014/03/07 01:33:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.6 2019/03/03 22:25:00 pgoyette Exp $"); #include #include @@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c #define MD1 "" #endif -MODULE(MODULE_CLASS_EXEC, compat_ultrix, "compat" MD1); +MODULE(MODULE_CLASS_EXEC, compat_ultrix, "compat_13" MD1); static struct execsw ultrix_execsw[] = { #ifdef EXEC_ECOFF
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: kamil Date: Tue Dec 19 19:20:31 UTC 2017 Modified Files: src/sys/compat/ultrix: syscalls.master ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: compat/ultrix: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/compat/ultrix/syscalls.master cvs rdiff -u -r1.70 -r1.71 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.65 -r1.66 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.72 -r1.73 src/sys/compat/ultrix/ultrix_sysent.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/ultrix/syscalls.master diff -u src/sys/compat/ultrix/syscalls.master:1.54 src/sys/compat/ultrix/syscalls.master:1.55 --- src/sys/compat/ultrix/syscalls.master:1.54 Tue Dec 19 18:20:11 2017 +++ src/sys/compat/ultrix/syscalls.master Tue Dec 19 19:20:30 2017 @@ -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); } Index: src/sys/compat/ultrix/ultrix_syscall.h diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.70 src/sys/compat/ultrix/ultrix_syscall.h:1.71 --- src/sys/compat/ultrix/ultrix_syscall.h:1.70 Tue Dec 19 18:20:11 2017 +++ src/sys/compat/ultrix/ultrix_syscall.h Tue Dec 19 19:20:30 2017 @@ -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 Index: src/sys/compat/ultrix/ultrix_syscallargs.h diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.65 src/sys/compat/ultrix/ultrix_syscallargs.h:1.66 --- src/sys/compat/ultrix/ultrix_syscallargs.h:1.65 Tue Dec 19 18:20:11 2017 +++ src/sys/compat/ultrix/ultrix_syscallargs.h Tue Dec 19 19:20:30 2017 @@ -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 * 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.69 src/sys/compat/ultrix/ultrix_syscalls.c:1.70 --- src/sys/compat/ultrix/ultrix_syscalls.c:1.69 Tue Dec 19 18:20:11 2017 +++ src/sys/compat/ultrix/ultrix_syscalls.c Tue Dec 19 19:20:30 2017 @@ -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
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: kamil Date: Tue Dec 19 18:20:12 UTC 2017 Modified Files: src/sys/compat/ultrix: syscalls.master ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: compat/ultrix: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/compat/ultrix/syscalls.master cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.64 -r1.65 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.68 -r1.69 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.71 -r1.72 src/sys/compat/ultrix/ultrix_sysent.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/ultrix/syscalls.master diff -u src/sys/compat/ultrix/syscalls.master:1.53 src/sys/compat/ultrix/syscalls.master:1.54 --- src/sys/compat/ultrix/syscalls.master:1.53 Tue Dec 19 08:23:22 2017 +++ src/sys/compat/ultrix/syscalls.master Tue Dec 19 18:20:11 2017 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp $ + $NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -118,7 +118,7 @@ 66 NOARGS { int|sys||vfork(void); } 67 OBSOL vread 68 OBSOL vwrite -69 NOARGS { int|sys||sbrk(intptr_t incr); } +69 OBSOL sbrk 70 OBSOL sstk 71 STD { int|ultrix_sys||mmap(void *addr, size_t len, \ int prot, u_int flags, int fd, long pos); } Index: src/sys/compat/ultrix/ultrix_syscall.h diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.69 src/sys/compat/ultrix/ultrix_syscall.h:1.70 --- src/sys/compat/ultrix/ultrix_syscall.h:1.69 Tue Dec 19 08:23:22 2017 +++ src/sys/compat/ultrix/ultrix_syscall.h Tue Dec 19 18:20:11 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscall.h,v 1.69 2017/12/19 08:23:22 kamil Exp $ */ +/* $NetBSD: ultrix_syscall.h,v 1.70 2017/12/19 18:20:11 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.52 2013/11/07 19:37:19 njoly Exp + * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp */ #ifndef _ULTRIX_SYS_SYSCALL_H_ @@ -156,9 +156,7 @@ /* 67 is obsolete vread */ /* 68 is obsolete vwrite */ -/* syscall: "sbrk" ret: "int" args: "intptr_t" */ -#define ULTRIX_SYS_sbrk 69 - +/* 69 is obsolete sbrk */ /* 70 is obsolete sstk */ /* syscall: "mmap" ret: "int" args: "void *" "size_t" "int" "u_int" "int" "long" */ #define ULTRIX_SYS_mmap 71 Index: src/sys/compat/ultrix/ultrix_syscallargs.h diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.64 src/sys/compat/ultrix/ultrix_syscallargs.h:1.65 --- src/sys/compat/ultrix/ultrix_syscallargs.h:1.64 Tue Dec 19 08:23:22 2017 +++ src/sys/compat/ultrix/ultrix_syscallargs.h Tue Dec 19 18:20:11 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: ultrix_syscallargs.h,v 1.64 2017/12/19 08:23:22 kamil Exp $ */ +/* $NetBSD: ultrix_syscallargs.h,v 1.65 2017/12/19 18:20:11 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.52 2013/11/07 19:37:19 njoly Exp + * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp */ #ifndef _ULTRIX_SYS_SYSCALLARGS_H_ @@ -145,8 +145,6 @@ struct sys_chroot_args; struct compat_43_sys_fstat_args; -struct sys_sbrk_args; - struct ultrix_sys_mmap_args { syscallarg(void *) addr; syscallarg(size_t) len; @@ -524,8 +522,6 @@ int compat_43_sys_getpagesize(struct lwp int sys_vfork(struct lwp *, const void *, register_t *); -int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, 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 *); Index: src/sys/compat/ultrix/ultrix_syscalls.c diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.68 src/sys/compat/ultrix/ultrix_syscalls.c:1.69 --- src/sys/compat/ultrix/ultrix_syscalls.c:1.68 Tue Dec 19 08:23:22 2017 +++ src/sys/compat/ultrix/ultrix_syscalls.c Tue Dec 19 18:20:11 2017 @@ -1,14 +1,14 @@ -/* $NetBSD: ultrix_syscalls.c,v 1.68 2017/12/19 08:23:22 kamil Exp $ */ +/* $NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.52 2013/11/07 19:37:19 njoly Exp + * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.68 2017/12/19 08:23:22 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $"); #if defined(_KERNEL_OPT) #include @@ -92,7 +92,7 @@
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: kamil Date: Tue Dec 19 08:23:23 UTC 2017 Modified Files: src/sys/compat/ultrix: syscalls.master ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: compat ultrix: Drop the sstk(2) syscall sstk(2) has never been implemented by the NetBSD kernel. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/compat/ultrix/syscalls.master cvs rdiff -u -r1.68 -r1.69 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.63 -r1.64 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.67 -r1.68 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.70 -r1.71 src/sys/compat/ultrix/ultrix_sysent.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/ultrix/syscalls.master diff -u src/sys/compat/ultrix/syscalls.master:1.52 src/sys/compat/ultrix/syscalls.master:1.53 --- src/sys/compat/ultrix/syscalls.master:1.52 Thu Nov 7 19:37:19 2013 +++ src/sys/compat/ultrix/syscalls.master Tue Dec 19 08:23:22 2017 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.52 2013/11/07 19:37:19 njoly Exp $ + $NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -119,7 +119,7 @@ 67 OBSOL vread 68 OBSOL vwrite 69 NOARGS { int|sys||sbrk(intptr_t incr); } -70 NOARGS { int|sys||sstk(int incr); } +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 @@ -358,4 +358,3 @@ unsigned nbytes, int *start, char *arg); } 257 STD { int|ultrix_sys||setsysinfo(unsigned op, char *buffer, \ unsigned nbytes, unsigned arg, unsigned flag); } - Index: src/sys/compat/ultrix/ultrix_syscall.h diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.68 src/sys/compat/ultrix/ultrix_syscall.h:1.69 --- src/sys/compat/ultrix/ultrix_syscall.h:1.68 Wed May 10 06:19:49 2017 +++ src/sys/compat/ultrix/ultrix_syscall.h Tue Dec 19 08:23:22 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_syscall.h,v 1.68 2017/05/10 06:19:49 riastradh Exp $ */ +/* $NetBSD: ultrix_syscall.h,v 1.69 2017/12/19 08:23:22 kamil Exp $ */ /* * System call numbers. @@ -159,9 +159,7 @@ /* syscall: "sbrk" ret: "int" args: "intptr_t" */ #define ULTRIX_SYS_sbrk 69 -/* syscall: "sstk" ret: "int" args: "int" */ -#define ULTRIX_SYS_sstk 70 - +/* 70 is obsolete sstk */ /* syscall: "mmap" ret: "int" args: "void *" "size_t" "int" "u_int" "int" "long" */ #define ULTRIX_SYS_mmap 71 Index: src/sys/compat/ultrix/ultrix_syscallargs.h diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.63 src/sys/compat/ultrix/ultrix_syscallargs.h:1.64 --- src/sys/compat/ultrix/ultrix_syscallargs.h:1.63 Wed May 10 06:19:49 2017 +++ src/sys/compat/ultrix/ultrix_syscallargs.h Tue Dec 19 08:23:22 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_syscallargs.h,v 1.63 2017/05/10 06:19:49 riastradh Exp $ */ +/* $NetBSD: ultrix_syscallargs.h,v 1.64 2017/12/19 08:23:22 kamil Exp $ */ /* * System call argument lists. @@ -147,8 +147,6 @@ struct compat_43_sys_fstat_args; struct sys_sbrk_args; -struct sys_sstk_args; - struct ultrix_sys_mmap_args { syscallarg(void *) addr; syscallarg(size_t) len; @@ -528,8 +526,6 @@ int sys_vfork(struct lwp *, const void * int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *); -int sys_sstk(struct lwp *, const struct sys_sstk_args *, 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 *); Index: src/sys/compat/ultrix/ultrix_syscalls.c diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.67 src/sys/compat/ultrix/ultrix_syscalls.c:1.68 --- src/sys/compat/ultrix/ultrix_syscalls.c:1.67 Wed May 10 06:19:49 2017 +++ src/sys/compat/ultrix/ultrix_syscalls.c Tue Dec 19 08:23:22 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_syscalls.c,v 1.67 2017/05/10 06:19:49 riastradh Exp $ */ +/* $NetBSD: ultrix_syscalls.c,v 1.68 2017/12/19 08:23:22 kamil Exp $ */ /* * System call names. @@ -8,7 +8,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.67 2017/05/10 06:19:49 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.68 2017/12/19 08:23:22 kamil Exp $"); #if defined(_KERNEL_OPT) #include @@ -93,7 +93,7 @@ const char *const ultrix_syscallnames[] /* 67 */ "#67 (obsolete vread)", /* 68 */ "#68 (obsolete vwrite)", /* 69 */ "sbrk", - /* 70 */ "sstk", + /* 70 */ "#70 (obsolete sstk)", /* 71 */ "mmap", /* 72 */ "vadvise", /* 73 */ "munmap", @@ -615,7 +615,7 @@ const char *const altultrix_syscallnames /* 67 */ NULL, /* obsolete vread */ /* 68 */ NULL, /* obsolete vwrite */ /* 69 */ NULL, /* sbrk */ - /* 70 */ NULL, /* sstk */ + /* 70 */ NULL, /* obsolete sstk */ /*
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: maxv Date: Sun Dec 3 12:53:52 UTC 2017 Modified Files: src/sys/compat/ultrix: ultrix_fs.c Log Message: Fix uninitialized pointer, found by Mootja. Not a surprise in untested code. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/compat/ultrix/ultrix_fs.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/ultrix/ultrix_fs.c diff -u src/sys/compat/ultrix/ultrix_fs.c:1.57 src/sys/compat/ultrix/ultrix_fs.c:1.58 --- src/sys/compat/ultrix/ultrix_fs.c:1.57 Thu Apr 13 09:18:18 2017 +++ src/sys/compat/ultrix/ultrix_fs.c Sun Dec 3 12:53:52 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_fs.c,v 1.57 2017/04/13 09:18:18 hannken Exp $ */ +/* $NetBSD: ultrix_fs.c,v 1.58 2017/12/03 12:53:52 maxv Exp $ */ /* * Copyright (c) 1995, 1997 Jonathan Stone @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.57 2017/04/13 09:18:18 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.58 2017/12/03 12:53:52 maxv Exp $"); #include #include @@ -276,7 +276,7 @@ ultrix_sys_getmnt(struct lwp *l, const s make_ultrix_mntent(sp, ); if ((error = copyout((void *), sfsp, sizeof(tem))) != 0) { - goto bad; + goto bad_freeiter; } sfsp++; count++; @@ -289,8 +289,9 @@ ultrix_sys_getmnt(struct lwp *l, const s else *retval = count; -bad: +bad_freeiter: mountlist_iterator_destroy(iter); +bad: if (path) free(path, M_TEMP); return error;
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: hannken Date: Thu Apr 13 09:18:18 UTC 2017 Modified Files: src/sys/compat/ultrix: ultrix_fs.c Log Message: Switch ultrix_sys_getmnt() to mountlist iterator. Really skip "start" items instead of a useless loop. Compile tested only. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/compat/ultrix/ultrix_fs.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/ultrix/ultrix_fs.c diff -u src/sys/compat/ultrix/ultrix_fs.c:1.56 src/sys/compat/ultrix/ultrix_fs.c:1.57 --- src/sys/compat/ultrix/ultrix_fs.c:1.56 Fri Oct 23 19:40:11 2015 +++ src/sys/compat/ultrix/ultrix_fs.c Thu Apr 13 09:18:18 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_fs.c,v 1.56 2015/10/23 19:40:11 maxv Exp $ */ +/* $NetBSD: ultrix_fs.c,v 1.57 2017/04/13 09:18:18 hannken Exp $ */ /* * Copyright (c) 1995, 1997 Jonathan Stone @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.56 2015/10/23 19:40:11 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.57 2017/04/13 09:18:18 hannken Exp $"); #include #include @@ -206,9 +206,10 @@ make_ultrix_mntent(struct statvfs *sp, s int ultrix_sys_getmnt(struct lwp *l, const struct ultrix_sys_getmnt_args *uap, register_t *retval) { - struct mount *mp, *nmp; + struct mount *mp; struct statvfs *sp; struct ultrix_fs_data *sfsp; + mount_iterator_t *iter; char *path; int mntflags; int skip; @@ -216,7 +217,6 @@ ultrix_sys_getmnt(struct lwp *l, const s long count, maxcount; int error; - nmp = NULL; /* XXX keep gcc quiet */ path = NULL; error = 0; maxcount = SCARG(uap, bufsize) / sizeof(struct ultrix_fs_data); @@ -237,6 +237,7 @@ ultrix_sys_getmnt(struct lwp *l, const s if ((error = copyinstr(SCARG(uap, path), path, MAXPATHLEN, NULL)) != 0) goto bad; + skip = 0; maxcount = 1; } else { /* @@ -247,20 +248,14 @@ ultrix_sys_getmnt(struct lwp *l, const s if ((error = copyin((void *)SCARG(uap, start), , sizeof(*SCARG(uap, start != 0) goto bad; - mutex_enter(_lock); - for (skip = start, mp = TAILQ_FIRST(); - mp != NULL && skip-- > 0; - mp = TAILQ_NEXT(mp, mnt_list)) - continue; - mutex_exit(_lock); + skip = start; } - mutex_enter(_lock); - for (count = 0, mp = TAILQ_FIRST(); - mp != NULL && count < maxcount; mp = nmp) { - if (vfs_busy(mp, )) { + count = 0; + mountlist_iterator_init(); + while (count < maxcount && (mp = mountlist_iterator_next(iter))) { + if (skip-- > 0) continue; - } if (sfsp != NULL) { struct ultrix_fs_data tem; sp = >mnt_stat; @@ -281,16 +276,13 @@ ultrix_sys_getmnt(struct lwp *l, const s make_ultrix_mntent(sp, ); if ((error = copyout((void *), sfsp, sizeof(tem))) != 0) { - vfs_unbusy(mp, false, NULL); goto bad; } sfsp++; count++; } } - vfs_unbusy(mp, false, ); } - mutex_exit(_lock); if (sfsp != NULL && count > maxcount) *retval = maxcount; @@ -298,6 +290,7 @@ ultrix_sys_getmnt(struct lwp *l, const s *retval = count; bad: + mountlist_iterator_destroy(iter); if (path) free(path, M_TEMP); return error;
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: christos Date: Thu Sep 24 14:44:44 UTC 2015 Modified Files: src/sys/compat/ultrix: ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.59 -r1.60 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.63 -r1.64 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.66 -r1.67 src/sys/compat/ultrix/ultrix_sysent.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/ultrix/ultrix_syscall.h diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.64 src/sys/compat/ultrix/ultrix_syscall.h:1.65 --- src/sys/compat/ultrix/ultrix_syscall.h:1.64 Sat Mar 7 11:41:54 2015 +++ src/sys/compat/ultrix/ultrix_syscall.h Thu Sep 24 10:44:44 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_syscall.h,v 1.64 2015/03/07 16:41:54 christos Exp $ */ +/* $NetBSD: ultrix_syscall.h,v 1.65 2015/09/24 14:44:44 christos Exp $ */ /* * System call numbers. Index: src/sys/compat/ultrix/ultrix_syscallargs.h diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.59 src/sys/compat/ultrix/ultrix_syscallargs.h:1.60 --- src/sys/compat/ultrix/ultrix_syscallargs.h:1.59 Sat Mar 7 11:41:54 2015 +++ src/sys/compat/ultrix/ultrix_syscallargs.h Thu Sep 24 10:44:44 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_syscallargs.h,v 1.59 2015/03/07 16:41:54 christos Exp $ */ +/* $NetBSD: ultrix_syscallargs.h,v 1.60 2015/09/24 14:44:44 christos Exp $ */ /* * System call argument lists. Index: src/sys/compat/ultrix/ultrix_syscalls.c diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.63 src/sys/compat/ultrix/ultrix_syscalls.c:1.64 --- src/sys/compat/ultrix/ultrix_syscalls.c:1.63 Sat Mar 7 11:41:54 2015 +++ src/sys/compat/ultrix/ultrix_syscalls.c Thu Sep 24 10:44:44 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_syscalls.c,v 1.63 2015/03/07 16:41:54 christos Exp $ */ +/* $NetBSD: ultrix_syscalls.c,v 1.64 2015/09/24 14:44:44 christos Exp $ */ /* * System call names. @@ -8,7 +8,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.63 2015/03/07 16:41:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.64 2015/09/24 14:44:44 christos Exp $"); #if defined(_KERNEL_OPT) #include @@ -18,6 +18,8 @@ __KERNEL_RCSID(0, "$NetBSD: ultrix_sysca #include #include #include +#else /* _KERNEL_OPT */ +#include #endif /* _KERNEL_OPT */ const char *const ultrix_syscallnames[] = { @@ -539,3 +541,525 @@ const char *const ultrix_syscallnames[] /* 510 */ "# filler", /* 511 */ "# filler", }; + + +/* libc style syscall names */ +const char *const altultrix_syscallnames[] = { + /* 0 */ "nosys", + /* 1 */ NULL, /* exit */ + /* 2 */ NULL, /* fork */ + /* 3 */ NULL, /* read */ + /* 4 */ NULL, /* write */ + /* 5 */ NULL, /* open */ + /* 6 */ NULL, /* close */ + /* 7 */ "wait", + /* 8 */ NULL, /* creat */ + /* 9 */ NULL, /* link */ + /* 10 */ NULL, /* unlink */ + /* 11 */ NULL, /* execv */ + /* 12 */ NULL, /* chdir */ + /* 13 */ NULL, /* obsolete time */ + /* 14 */ NULL, /* mknod */ + /* 15 */ NULL, /* chmod */ + /* 16 */ NULL, /* __posix_chown */ + /* 17 */ "obreak", + /* 18 */ NULL, /* obsolete stat */ + /* 19 */ NULL, /* lseek */ + /* 20 */ NULL, /* getpid */ + /* 21 */ NULL, /* mount */ + /* 22 */ NULL, /* obsolete sysV_unmount */ + /* 23 */ NULL, /* setuid */ + /* 24 */ NULL, /* getuid */ + /* 25 */ NULL, /* obsolete v7 stime */ + /* 26 */ NULL, /* obsolete v7 ptrace */ + /* 27 */ NULL, /* obsolete v7 alarm */ + /* 28 */ NULL, /* obsolete v7 fstat */ + /* 29 */ NULL, /* obsolete v7 pause */ + /* 30 */ NULL, /* obsolete v7 utime */ + /* 31 */ NULL, /* obsolete v7 stty */ + /* 32 */ NULL, /* obsolete v7 gtty */ + /* 33 */ NULL, /* access */ + /* 34 */ NULL, /* obsolete v7 nice */ + /* 35 */ NULL, /* obsolete v7 ftime */ + /* 36 */ NULL, /* sync */ + /* 37 */ NULL, /* kill */ + /* 38 */ "stat", + /* 39 */ NULL, /* obsolete v7 setpgrp */ + /* 40 */ "lstat", + /* 41 */ NULL, /* dup */ + /* 42 */ NULL, /* pipe */ + /* 43 */ NULL, /* obsolete v7 times */ + /* 44 */ NULL, /* profil */ + /* 45 */ NULL, /* unimplemented */ + /* 46 */ NULL, /* obsolete v7 setgid */ + /* 47 */ NULL, /* getgid */ + /* 48 */ NULL, /* unimplemented ssig */ + /* 49 */ NULL, /* unimplemented reserved for USG */ + /* 50 */ NULL, /* unimplemented reserved for USG */ + /* 51 */ NULL, /* acct */ + /* 52 */ NULL, /* unimplemented */ + /* 53 */ NULL, /* unimplemented syslock */ + /* 54 */ NULL, /* ioctl */ + /* 55 */ NULL, /* reboot */ + /* 56 */ NULL, /* unimplemented v7 mpxchan */ + /* 57 */ NULL, /* symlink */ + /* 58 */ NULL, /* readlink */ + /* 59 */ NULL, /* execve */ + /* 60 */ NULL, /* umask */ + /* 61 */ NULL, /* chroot */ + /* 62 */ NULL, /* fstat */ + /* 63 */ NULL, /*
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: christos Date: Sat Nov 23 23:34:04 UTC 2013 Modified Files: src/sys/compat/ultrix: ultrix_fs.c Log Message: fix previous, list ends in NULL, and don't open-code To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/compat/ultrix/ultrix_fs.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/ultrix/ultrix_fs.c diff -u src/sys/compat/ultrix/ultrix_fs.c:1.52 src/sys/compat/ultrix/ultrix_fs.c:1.53 --- src/sys/compat/ultrix/ultrix_fs.c:1.52 Sat Nov 23 11:15:25 2013 +++ src/sys/compat/ultrix/ultrix_fs.c Sat Nov 23 18:34:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_fs.c,v 1.52 2013/11/23 16:15:25 riz Exp $ */ +/* $NetBSD: ultrix_fs.c,v 1.53 2013/11/23 23:34:04 christos Exp $ */ /* * Copyright (c) 1995, 1997 Jonathan Stone @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ultrix_fs.c,v 1.52 2013/11/23 16:15:25 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: ultrix_fs.c,v 1.53 2013/11/23 23:34:04 christos Exp $); #include sys/param.h #include sys/systm.h @@ -248,15 +248,16 @@ ultrix_sys_getmnt(struct lwp *l, const s sizeof(*SCARG(uap, start != 0) goto bad; mutex_enter(mountlist_lock); - for (skip = start, mp = mountlist.tqh_first; - mp != (void*)mountlist skip-- 0; mp = nmp) - nmp = mp-mnt_list.tqe_next; + for (skip = start, mp = TAILQ_FIRST(mountlist); + mp != TAILQ_END(mountlist) skip-- 0; + mp = TAILQ_NEXT(mp, mnt_list)) + continue; mutex_exit(mountlist_lock); } mutex_enter(mountlist_lock); - for (count = 0, mp = mountlist.tqh_first; - mp != (void*)mountlist count maxcount; mp = nmp) { + for (count = 0, mp = TAILQ_FIRST(mountlist); + mp != TAILQ_END(mountlist) count maxcount; mp = nmp) { if (vfs_busy(mp, nmp)) { continue; }