From b25a7607312a82c26f875b2db5909659e4a95b52 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Fri, 5 Apr 2024 14:15:37 +0000
Subject: [PATCH] sync

---
 sys/kern/init_sysent.c |  8 ++++----
 sys/kern/syscalls.c    |  6 +++---
 sys/sys/syscall.h      |  8 +++-----
 sys/sys/syscallargs.h  | 10 ++--------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 05a336cb6fa..f61175f8b37 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.276 2024/03/28 02:23:31 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.277 2024/04/05 14:15:37 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.259 2024/03/28 02:19:57 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.260 2024/04/05 14:15:13 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -96,8 +96,8 @@ const struct sysent sysent[] = {
 	    sys_fchflags },			/* 35 = fchflags */
 	{ 0, 0, 0,
 	    sys_sync },				/* 36 = sync */
-	{ 2, s(struct sys_msyscall_args), 0,
-	    sys_msyscall },			/* 37 = msyscall */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 37 = obsolete msyscall */
 	{ 2, s(struct sys_stat_args), 0,
 	    sys_stat },				/* 38 = stat */
 	{ 0, 0, SY_NOLOCK | 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 874ca99d1bd..65cb8a2b144 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.274 2024/03/28 02:23:31 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.275 2024/04/05 14:15:37 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.259 2024/03/28 02:19:57 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.260 2024/04/05 14:15:13 deraadt Exp 
  */
 
 const char *const syscallnames[] = {
@@ -49,7 +49,7 @@ const char *const syscallnames[] = {
 	"chflags",			/* 34 = chflags */
 	"fchflags",			/* 35 = fchflags */
 	"sync",			/* 36 = sync */
-	"msyscall",			/* 37 = msyscall */
+	"#37 (obsolete msyscall)",		/* 37 = obsolete msyscall */
 	"stat",			/* 38 = stat */
 	"getppid",			/* 39 = getppid */
 	"lstat",			/* 40 = lstat */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 8aae55d2a00..4326ca82a36 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.273 2024/03/28 02:27:14 deraadt Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.274 2024/04/05 14:15:37 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.259 2024/03/28 02:19:57 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.260 2024/04/05 14:15:13 deraadt Exp 
  */
 
 /* syscall: "exit" ret: "void" args: "int" */
@@ -115,9 +115,7 @@
 /* syscall: "sync" ret: "void" args: */
 #define	SYS_sync	36
 
-/* syscall: "msyscall" ret: "int" args: "void *" "size_t" */
-#define	SYS_msyscall	37
-
+				/* 37 is obsolete msyscall */
 /* syscall: "stat" ret: "int" args: "const char *" "struct stat *" */
 #define	SYS_stat	38
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index a2c1d0d7e7b..7e7b47b0a45 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.276 2024/03/28 02:27:14 deraadt Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.277 2024/04/05 14:15:37 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.259 2024/03/28 02:19:57 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.260 2024/04/05 14:15:13 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -186,11 +186,6 @@ struct sys_fchflags_args {
 	syscallarg(u_int) flags;
 };
 
-struct sys_msyscall_args {
-	syscallarg(void *) addr;
-	syscallarg(size_t) len;
-};
-
 struct sys_stat_args {
 	syscallarg(const char *) path;
 	syscallarg(struct stat *) ub;
@@ -1196,7 +1191,6 @@ int	sys_access(struct proc *, void *, register_t *);
 int	sys_chflags(struct proc *, void *, register_t *);
 int	sys_fchflags(struct proc *, void *, register_t *);
 int	sys_sync(struct proc *, void *, register_t *);
-int	sys_msyscall(struct proc *, void *, register_t *);
 int	sys_stat(struct proc *, void *, register_t *);
 int	sys_getppid(struct proc *, void *, register_t *);
 int	sys_lstat(struct proc *, void *, register_t *);
-- 
2.20.1