From: deraadt <deraadt@openbsd.org>
Date: Sat, 11 Feb 2023 23:10:24 +0000 (+0000)
Subject: sync for __syscall removal
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1e5b016c5082d3134671faf8f6f6a3edd4802521;p=openbsd

sync for __syscall removal
---

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 88f9ac086d8..27011f5c4f7 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.256 2023/01/07 05:25:39 guenther Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.257 2023/02/11 23:10:25 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.239 2023/01/07 05:24:58 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.240 2023/02/11 23:07:25 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -434,7 +434,7 @@ const struct sysent sysent[] = {
 	{ 7, s(struct sys_pad_mmap_args), 0,
 	    sys_pad_mmap },			/* 197 = pad_mmap */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 198 = __syscall (indir) */
+	    sys_nosys },			/* 198 = obsolete __syscall */
 	{ 4, s(struct sys_pad_lseek_args), SY_NOLOCK | 0,
 	    sys_pad_lseek },			/* 199 = pad_lseek */
 	{ 3, s(struct sys_pad_truncate_args), 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 179e5385b04..d779c4721b4 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.254 2023/01/07 05:25:39 guenther Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.255 2023/02/11 23:10:25 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.239 2023/01/07 05:24:58 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.240 2023/02/11 23:07:25 deraadt Exp 
  */
 
 const char *const syscallnames[] = {
@@ -222,7 +222,7 @@ const char *const syscallnames[] = {
 	"setrlimit",			/* 195 = setrlimit */
 	"#196 (obsolete ogetdirentries48)",		/* 196 = obsolete ogetdirentries48 */
 	"pad_mmap",			/* 197 = pad_mmap */
-	"__syscall",			/* 198 = __syscall */
+	"#198 (obsolete __syscall)",		/* 198 = obsolete __syscall */
 	"pad_lseek",			/* 199 = pad_lseek */
 	"pad_truncate",			/* 200 = pad_truncate */
 	"pad_ftruncate",			/* 201 = pad_ftruncate */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index ab7c0839582..a00a8048d8e 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.253 2023/01/07 05:25:39 guenther Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.254 2023/02/11 23:10:24 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.239 2023/01/07 05:24:58 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.240 2023/02/11 23:07:25 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -524,9 +524,7 @@
 /* syscall: "pad_mmap" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" "off_t" */
 #define	SYS_pad_mmap	197
 
-/* syscall: "__syscall" ret: "quad_t" args: "quad_t" "..." */
-#define	SYS___syscall	198
-
+				/* 198 is obsolete __syscall */
 /* syscall: "pad_lseek" ret: "off_t" args: "int" "int" "off_t" "int" */
 #define	SYS_pad_lseek	199
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 9fc5a40e503..b89dd1b745f 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.256 2023/01/07 05:25:39 guenther Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.257 2023/02/11 23:10:24 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.239 2023/01/07 05:24:58 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.240 2023/02/11 23:07:25 deraadt Exp 
  */
 
 #ifdef	syscallarg