Module Name: src
Committed By: kamil
Date: Tue Dec 19 08:09:36 UTC 2017
Modified Files:
src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h
aoutm68k_syscalls.c aoutm68k_sysent.c syscalls.master
Log Message:
compat aoutm68k: Mark sstk(2) as OBSOL
Remove the sstk(2) syscall support and mark it as obsolete.
It has never been implemented in the kernel.
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/compat/aoutm68k/aoutm68k_syscall.h
cvs rdiff -u -r1.46 -r1.47 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/aoutm68k/aoutm68k_syscalls.c
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/aoutm68k/aoutm68k_sysent.c
cvs rdiff -u -r1.37 -r1.38 src/sys/compat/aoutm68k/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/aoutm68k/aoutm68k_syscall.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.48 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.49
--- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.48 Wed May 10 06:19:48 2017
+++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Tue Dec 19 08:09:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_syscall.h,v 1.48 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: aoutm68k_syscall.h,v 1.49 2017/12/19 08:09:36 kamil Exp $ */
/*
* System call numbers.
@@ -267,9 +267,7 @@
/* syscall: "sbrk" ret: "int" args: "intptr_t" */
#define AOUTM68K_SYS_sbrk 69
-/* syscall: "sstk" ret: "int" args: "int" */
-#define AOUTM68K_SYS_sstk 70
-
+ /* 70 is obsolete sstk */
#if defined(COMPAT_43) || !defined(_KERNEL)
/* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define AOUTM68K_SYS_ommap 71
Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.46 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.47
--- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.46 Wed May 10 06:19:48 2017
+++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Tue Dec 19 08:09:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_syscallargs.h,v 1.46 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: aoutm68k_syscallargs.h,v 1.47 2017/12/19 08:09:36 kamil Exp $ */
/*
* System call argument lists.
@@ -191,8 +191,6 @@ struct compat_12_sys_msync_args;
#endif
struct sys_sbrk_args;
-
-struct sys_sstk_args;
#if defined(COMPAT_43) || !defined(_KERNEL)
struct compat_43_sys_mmap_args;
@@ -824,8 +822,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 *);
-
#if defined(COMPAT_43) || !defined(_KERNEL)
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
Index: src/sys/compat/aoutm68k/aoutm68k_syscalls.c
diff -u src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.45 src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.46
--- src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.45 Wed May 10 06:19:48 2017
+++ src/sys/compat/aoutm68k/aoutm68k_syscalls.c Tue Dec 19 08:09:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_syscalls.c,v 1.45 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: aoutm68k_syscalls.c,v 1.46 2017/12/19 08:09:36 kamil Exp $ */
/*
* System call names.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.45 2017/05/10 06:19:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.46 2017/12/19 08:09:36 kamil Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -152,7 +152,7 @@ const char *const aoutm68k_syscallnames[
/* 67 */ "#67 (obsolete vread)",
/* 68 */ "#68 (obsolete vwrite)",
/* 69 */ "sbrk",
- /* 70 */ "sstk",
+ /* 70 */ "#70 (obsolete sstk)",
#if defined(COMPAT_43) || !defined(_KERNEL)
/* 71 */ "ommap",
#else
@@ -899,7 +899,7 @@ const char *const altaoutm68k_syscallnam
/* 67 */ NULL, /* obsolete vread */
/* 68 */ NULL, /* obsolete vwrite */
/* 69 */ NULL, /* sbrk */
- /* 70 */ NULL, /* sstk */
+ /* 70 */ NULL, /* obsolete sstk */
#if defined(COMPAT_43) || !defined(_KERNEL)
/* 71 */ "mmap",
#else
Index: src/sys/compat/aoutm68k/aoutm68k_sysent.c
diff -u src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.50 src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.51
--- src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.50 Wed May 10 06:19:48 2017
+++ src/sys/compat/aoutm68k/aoutm68k_sysent.c Tue Dec 19 08:09:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_sysent.c,v 1.50 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: aoutm68k_sysent.c,v 1.51 2017/12/19 08:09:36 kamil Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.50 2017/05/10 06:19:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.51 2017/12/19 08:09:36 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -421,9 +421,8 @@ struct sysent aoutm68k_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 */
#if defined(COMPAT_43) || !defined(_KERNEL)
{
ns(struct compat_43_sys_mmap_args),
Index: src/sys/compat/aoutm68k/syscalls.master
diff -u src/sys/compat/aoutm68k/syscalls.master:1.37 src/sys/compat/aoutm68k/syscalls.master:1.38
--- src/sys/compat/aoutm68k/syscalls.master:1.37 Mon Mar 7 19:26:35 2011
+++ src/sys/compat/aoutm68k/syscalls.master Tue Dec 19 08:09:36 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp $
+ $NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -213,7 +213,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
#if defined(COMPAT_43) || !defined(_KERNEL)
71 NOARGS { int|compat_43_sys||mmap(void *addr, size_t len, \
int prot, int flags, int fd, long pos); } ommap
