Skip to content

Commit 8c7f5cc

Browse files
author
deraadt
committed
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.
1 parent 1e5b016 commit 8c7f5cc

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

sys/kern/syscalls.master

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; $OpenBSD: syscalls.master,v 1.240 2023/02/11 23:07:25 deraadt Exp $
1+
; $OpenBSD: syscalls.master,v 1.241 2023/02/11 23:21:22 deraadt Exp $
22
; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
33

44
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -328,10 +328,8 @@
328328
172 STD NOLOCK { ssize_t sys_pwritev(int fd, \
329329
const struct iovec *iovp, int iovcnt, \
330330
off_t offset); }
331-
173 STD NOLOCK { ssize_t sys_pad_pread(int fd, void *buf, \
332-
size_t nbyte, int pad, off_t offset); }
333-
174 STD NOLOCK { ssize_t sys_pad_pwrite(int fd, const void *buf, \
334-
size_t nbyte, int pad, off_t offset); }
331+
173 OBSOL pad_pread
332+
174 OBSOL pad_pwrite
335333
175 UNIMPL ntp_gettime
336334
176 UNIMPL ntp_adjtime
337335
177 UNIMPL
@@ -358,14 +356,11 @@
358356
195 STD NOLOCK { int sys_setrlimit(int which, \
359357
const struct rlimit *rlp); }
360358
196 OBSOL ogetdirentries48
361-
197 STD { void *sys_pad_mmap(void *addr, size_t len, int prot, \
362-
int flags, int fd, long pad, off_t pos); }
359+
197 OBSOL pad_mmap
363360
198 OBSOL __syscall
364-
199 STD NOLOCK { off_t sys_pad_lseek(int fd, int pad, off_t offset, \
365-
int whence); }
366-
200 STD { int sys_pad_truncate(const char *path, int pad, \
367-
off_t length); }
368-
201 STD { int sys_pad_ftruncate(int fd, int pad, off_t length); }
361+
199 OBSOL pad_lseek
362+
200 OBSOL pad_truncate
363+
201 OBSOL pad_ftruncate
369364
202 STD { int sys_sysctl(const int *name, u_int namelen, \
370365
void *old, size_t *oldlenp, void *new, \
371366
size_t newlen); }
@@ -464,12 +459,8 @@
464459
264 STD { int sys_fhopen(const fhandle_t *fhp, int flags); }
465460
265 UNIMPL
466461
266 UNIMPL
467-
267 STD NOLOCK { ssize_t sys_pad_preadv(int fd, \
468-
const struct iovec *iovp, int iovcnt, \
469-
int pad, off_t offset); }
470-
268 STD NOLOCK { ssize_t sys_pad_pwritev(int fd, \
471-
const struct iovec *iovp, int iovcnt, \
472-
int pad, off_t offset); }
462+
267 OBSOL pad_preadv
463+
268 OBSOL pad_pwritev
473464
269 STD NOLOCK { int sys_kqueue(void); }
474465
270 OBSOL t32_kevent
475466
271 STD { int sys_mlockall(int flags); }
@@ -491,9 +482,7 @@
491482
284 STD { int sys_setresgid(gid_t rgid, gid_t egid, \
492483
gid_t sgid); }
493484
285 OBSOL sys_omquery
494-
286 STD { void *sys_pad_mquery(void *addr, size_t len, \
495-
int prot, int flags, int fd, long pad, \
496-
off_t pos); }
485+
286 OBSOL pad_mquery
497486
287 STD NOLOCK { int sys_closefrom(int fd); }
498487
288 STD { int sys_sigaltstack(const struct sigaltstack *nss, \
499488
struct sigaltstack *oss); }

0 commit comments

Comments
 (0)