From 8c7f5cc47d34f1bd83a08278dad544a34184dabf Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 11 Feb 2023 23:21:22 +0000
Subject: [PATCH] non-padded 64-bit system calls arrived 2021/12/23, over a
 year ago. time to delete the backwards compat padded functions in the kernel.

---
 sys/kern/syscalls.master | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 4bb0a8c905b..6da9a113f09 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.240 2023/02/11 23:07:25 deraadt Exp $
+;	$OpenBSD: syscalls.master,v 1.241 2023/02/11 23:21:22 deraadt Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -328,10 +328,8 @@
 172	STD NOLOCK	{ ssize_t sys_pwritev(int fd, \
 			    const struct iovec *iovp, int iovcnt, \
 			    off_t offset); }
-173	STD NOLOCK	{ ssize_t sys_pad_pread(int fd, void *buf, \
-			  size_t nbyte, int pad, off_t offset); }
-174	STD NOLOCK	{ ssize_t sys_pad_pwrite(int fd, const void *buf, \
-			  size_t nbyte, int pad, off_t offset); }
+173	OBSOL		pad_pread
+174	OBSOL		pad_pwrite
 175	UNIMPL		ntp_gettime
 176	UNIMPL		ntp_adjtime
 177	UNIMPL
@@ -358,14 +356,11 @@
 195	STD NOLOCK	{ int sys_setrlimit(int which, \
 			    const struct rlimit *rlp); }
 196	OBSOL		ogetdirentries48
-197	STD		{ void *sys_pad_mmap(void *addr, size_t len, int prot, \
-			    int flags, int fd, long pad, off_t pos); }
+197	OBSOL		pad_mmap
 198	OBSOL		__syscall
-199	STD NOLOCK	{ off_t sys_pad_lseek(int fd, int pad, off_t offset, \
-			    int whence); }
-200	STD		{ int sys_pad_truncate(const char *path, int pad, \
-			    off_t length); }
-201	STD		{ int sys_pad_ftruncate(int fd, int pad, off_t length); }
+199	OBSOL		pad_lseek
+200	OBSOL		pad_truncate
+201	OBSOL		pad_ftruncate
 202	STD		{ int sys_sysctl(const int *name, u_int namelen, \
 			    void *old, size_t *oldlenp, void *new, \
 			    size_t newlen); }
@@ -464,12 +459,8 @@
 264	STD		{ int sys_fhopen(const fhandle_t *fhp, int flags); }
 265	UNIMPL
 266	UNIMPL
-267	STD NOLOCK	{ ssize_t sys_pad_preadv(int fd, \
-			  const struct iovec *iovp, int iovcnt, \
-			  int pad, off_t offset); }
-268	STD NOLOCK	{ ssize_t sys_pad_pwritev(int fd, \
-			  const struct iovec *iovp, int iovcnt, \
-			  int pad, off_t offset); }
+267	OBSOL		pad_preadv
+268	OBSOL		pad_pwritev
 269	STD NOLOCK	{ int sys_kqueue(void); }
 270	OBSOL		t32_kevent
 271	STD		{ int sys_mlockall(int flags); }
@@ -491,9 +482,7 @@
 284	STD		{ int sys_setresgid(gid_t rgid, gid_t egid, \
 			    gid_t sgid); }
 285	OBSOL		sys_omquery
-286	STD		{ void *sys_pad_mquery(void *addr, size_t len, \
-			    int prot, int flags, int fd, long pad, \
-			    off_t pos); }
+286	OBSOL		pad_mquery
 287	STD NOLOCK	{ int sys_closefrom(int fd); }
 288	STD		{ int sys_sigaltstack(const struct sigaltstack *nss, \
 			    struct sigaltstack *oss); }
-- 
2.20.1