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 <The NetBSD Foundation>
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 <sys/cdefs.h>
-__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 <sys/param.h>
@@ -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 */
/* 71 */ NULL, /* mmap */
/* 72 */ "ovadvise",
/* 73 */ NULL, /* munmap */
Index: src/sys/compat/ultrix/ultrix_sysent.c
diff -u src/sys/compat/ultrix/ultrix_sysent.c:1.70 src/sys/compat/ultrix/ultrix_sysent.c:1.71
--- src/sys/compat/ultrix/ultrix_sysent.c:1.70 Wed May 10 06:19:49 2017
+++ src/sys/compat/ultrix/ultrix_sysent.c Tue Dec 19 08:23:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_sysent.c,v 1.70 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: ultrix_sysent.c,v 1.71 2017/12/19 08:23:22 kamil Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_sysent.c,v 1.70 2017/05/10 06:19:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_sysent.c,v 1.71 2017/12/19 08:23:22 kamil Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -291,9 +291,8 @@ struct sysent ultrix_sysent[] = {
.sy_call = (sy_call_t *)sys_sbrk
}, /* 69 = sbrk */
{
- ns(struct sys_sstk_args),
- .sy_call = (sy_call_t *)sys_sstk
- }, /* 70 = sstk */
+ .sy_call = sys_nosys,
+ }, /* 70 = filler */
{
ns(struct ultrix_sys_mmap_args),
.sy_flags = SYCALL_ARG_PTR,
