Module Name: src
Committed By: kamil
Date: Tue Dec 19 08:24:41 UTC 2017
Modified Files:
src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h
sunos32_syscalls.c sunos32_sysent.c syscalls.master
Log Message:
compat sunos32: 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.33 -r1.34 src/sys/compat/sunos32/sunos32_syscall.h
cvs rdiff -u -r1.32 -r1.33 src/sys/compat/sunos32/sunos32_syscallargs.h \
src/sys/compat/sunos32/sunos32_syscalls.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/sunos32/sunos32_sysent.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/sunos32/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/sunos32/sunos32_syscall.h
diff -u src/sys/compat/sunos32/sunos32_syscall.h:1.33 src/sys/compat/sunos32/sunos32_syscall.h:1.34
--- src/sys/compat/sunos32/sunos32_syscall.h:1.33 Wed May 10 06:19:49 2017
+++ src/sys/compat/sunos32/sunos32_syscall.h Tue Dec 19 08:24:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_syscall.h,v 1.33 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: sunos32_syscall.h,v 1.34 2017/12/19 08:24:41 kamil Exp $ */
/*
* System call numbers.
@@ -159,9 +159,7 @@
/* syscall: "netbsd32_sbrk" ret: "int" args: "netbsd32_intptr_t" */
#define SUNOS32_SYS_netbsd32_sbrk 69
-/* syscall: "netbsd32_sstk" ret: "int" args: "int" */
-#define SUNOS32_SYS_netbsd32_sstk 70
-
+ /* 70 is obsolete sstk */
/* syscall: "mmap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" */
#define SUNOS32_SYS_mmap 71
Index: src/sys/compat/sunos32/sunos32_syscallargs.h
diff -u src/sys/compat/sunos32/sunos32_syscallargs.h:1.32 src/sys/compat/sunos32/sunos32_syscallargs.h:1.33
--- src/sys/compat/sunos32/sunos32_syscallargs.h:1.32 Wed May 10 06:19:49 2017
+++ src/sys/compat/sunos32/sunos32_syscallargs.h Tue Dec 19 08:24:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_syscallargs.h,v 1.32 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: sunos32_syscallargs.h,v 1.33 2017/12/19 08:24:41 kamil Exp $ */
/*
* System call argument lists.
@@ -181,8 +181,6 @@ check_syscall_args(sunos32_sys_omsync)
struct netbsd32_sbrk_args;
-struct netbsd32_sstk_args;
-
struct sunos32_sys_mmap_args {
syscallarg(netbsd32_voidp) addr;
syscallarg(netbsd32_size_t) len;
@@ -568,8 +566,6 @@ int sys_vfork(struct lwp *, const void *
int netbsd32_sbrk(struct lwp *, const struct netbsd32_sbrk_args *, register_t *);
-int netbsd32_sstk(struct lwp *, const struct netbsd32_sstk_args *, 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 *);
Index: src/sys/compat/sunos32/sunos32_syscalls.c
diff -u src/sys/compat/sunos32/sunos32_syscalls.c:1.32 src/sys/compat/sunos32/sunos32_syscalls.c:1.33
--- src/sys/compat/sunos32/sunos32_syscalls.c:1.32 Wed May 10 06:19:49 2017
+++ src/sys/compat/sunos32/sunos32_syscalls.c Tue Dec 19 08:24:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_syscalls.c,v 1.32 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: sunos32_syscalls.c,v 1.33 2017/12/19 08:24:41 kamil Exp $ */
/*
* System call names.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.32 2017/05/10 06:19:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.33 2017/12/19 08:24:41 kamil Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -102,7 +102,7 @@ const char *const sunos32_syscallnames[]
/* 67 */ "#67 (obsolete vread)",
/* 68 */ "#68 (obsolete vwrite)",
/* 69 */ "netbsd32_sbrk",
- /* 70 */ "netbsd32_sstk",
+ /* 70 */ "#70 (obsolete sstk)",
/* 71 */ "mmap",
/* 72 */ "vadvise",
/* 73 */ "netbsd32_munmap",
@@ -375,7 +375,7 @@ const char *const altsunos32_syscallname
/* 67 */ NULL, /* obsolete vread */
/* 68 */ NULL, /* obsolete vwrite */
/* 69 */ "sbrk",
- /* 70 */ "sstk",
+ /* 70 */ NULL, /* obsolete sstk */
/* 71 */ NULL, /* mmap */
/* 72 */ "ovadvise",
/* 73 */ "munmap",
Index: src/sys/compat/sunos32/sunos32_sysent.c
diff -u src/sys/compat/sunos32/sunos32_sysent.c:1.34 src/sys/compat/sunos32/sunos32_sysent.c:1.35
--- src/sys/compat/sunos32/sunos32_sysent.c:1.34 Wed May 10 06:19:49 2017
+++ src/sys/compat/sunos32/sunos32_sysent.c Tue Dec 19 08:24:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_sysent.c,v 1.34 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: sunos32_sysent.c,v 1.35 2017/12/19 08:24:41 kamil Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.34 2017/05/10 06:19:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_sysent.c,v 1.35 2017/12/19 08:24:41 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -281,9 +281,8 @@ struct sysent sunos32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_sbrk
}, /* 69 = netbsd32_sbrk */
{
- ns(struct netbsd32_sstk_args),
- .sy_call = (sy_call_t *)netbsd32_sstk
- }, /* 70 = netbsd32_sstk */
+ .sy_call = sys_nosys,
+ }, /* 70 = filler */
{
ns(struct sunos32_sys_mmap_args),
.sy_call = (sy_call_t *)sunos32_sys_mmap
Index: src/sys/compat/sunos32/syscalls.master
diff -u src/sys/compat/sunos32/syscalls.master:1.22 src/sys/compat/sunos32/syscalls.master:1.23
--- src/sys/compat/sunos32/syscalls.master:1.22 Thu Nov 7 19:37:19 2013
+++ src/sys/compat/sunos32/syscalls.master Tue Dec 19 08:24:41 2017
@@ -1,4 +1,4 @@
-; $NetBSD: syscalls.master,v 1.22 2013/11/07 19:37:19 njoly Exp $
+; $NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp $
; from :NetBSD: syscalls.master,v 1.57 2000/12/09 07:10:36 mycroft Exp
@@ -135,7 +135,7 @@
67 OBSOL vread
68 OBSOL vwrite
69 NOARGS { int|netbsd32||sbrk(netbsd32_intptr_t incr); }
-70 NOARGS { int|netbsd32||sstk(int incr); }
+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
