sync

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 834f398..e65d907 100644 (file)
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*     $OpenBSD: init_sysent.c,v 1.232 2021/12/09 00:26:10 guenther Exp $      */
+/*     $OpenBSD: init_sysent.c,v 1.233 2021/12/23 18:50:59 guenther Exp $      */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.220 2021/11/29 16:30:30 mvs Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.221 2021/12/23 18:50:31 guenther Exp 
  */
 
 #include <sys/param.h>
@@ -125,8 +125,8 @@ const struct sysent sysent[] = {
            sys_getgid },                       /* 47 = getgid */
        { 2, s(struct sys_sigprocmask_args), SY_NOLOCK | 0,
            sys_sigprocmask },                  /* 48 = sigprocmask */
-       { 0, 0, 0,
-           sys_nosys },                        /* 49 = obsolete ogetlogin */
+       { 6, s(struct sys_mmap_args), 0,
+           sys_mmap },                         /* 49 = mmap */
        { 1, s(struct sys_setlogin_args), 0,
            sys_setlogin },                     /* 50 = setlogin */
 #ifdef ACCOUNTING
@@ -188,8 +188,8 @@ const struct sysent sysent[] = {
            sys_utimes },                       /* 76 = utimes */
        { 2, s(struct sys_futimes_args), 0,
            sys_futimes },                      /* 77 = futimes */
-       { 0, 0, 0,
-           sys_nosys },                        /* 78 = unimplemented mincore */
+       { 6, s(struct sys_mquery_args), 0,
+           sys_mquery },                       /* 78 = mquery */
        { 2, s(struct sys_getgroups_args), SY_NOLOCK | 0,
            sys_getgroups },                    /* 79 = getgroups */
        { 2, s(struct sys_setgroups_args), 0,
@@ -369,24 +369,24 @@ const struct sysent sysent[] = {
            sys___tmpfd },                      /* 164 = __tmpfd */
        { 2, s(struct sys_sysarch_args), 0,
            sys_sysarch },                      /* 165 = sysarch */
-       { 0, 0, 0,
-           sys_nosys },                        /* 166 = unimplemented */
-       { 0, 0, 0,
-           sys_nosys },                        /* 167 = unimplemented */
-       { 0, 0, 0,
-           sys_nosys },                        /* 168 = unimplemented */
-       { 0, 0, 0,
-           sys_nosys },                        /* 169 = obsolete semsys10 */
-       { 0, 0, 0,
-           sys_nosys },                        /* 170 = obsolete msgsys10 */
-       { 0, 0, 0,
-           sys_nosys },                        /* 171 = obsolete shmsys10 */
-       { 0, 0, 0,
-           sys_nosys },                        /* 172 = unimplemented */
-       { 5, s(struct sys_pread_args), SY_NOLOCK | 0,
-           sys_pread },                        /* 173 = pread */
-       { 5, s(struct sys_pwrite_args), SY_NOLOCK | 0,
-           sys_pwrite },                       /* 174 = pwrite */
+       { 3, s(struct sys_lseek_args), SY_NOLOCK | 0,
+           sys_lseek },                        /* 166 = lseek */
+       { 2, s(struct sys_truncate_args), 0,
+           sys_truncate },                     /* 167 = truncate */
+       { 2, s(struct sys_ftruncate_args), 0,
+           sys_ftruncate },                    /* 168 = ftruncate */
+       { 4, s(struct sys_pread_args), SY_NOLOCK | 0,
+           sys_pread },                        /* 169 = pread */
+       { 4, s(struct sys_pwrite_args), SY_NOLOCK | 0,
+           sys_pwrite },                       /* 170 = pwrite */
+       { 4, s(struct sys_preadv_args), SY_NOLOCK | 0,
+           sys_preadv },                       /* 171 = preadv */
+       { 4, s(struct sys_pwritev_args), SY_NOLOCK | 0,
+           sys_pwritev },                      /* 172 = pwritev */
+       { 5, s(struct sys_pad_pread_args), SY_NOLOCK | 0,
+           sys_pad_pread },                    /* 173 = pad_pread */
+       { 5, s(struct sys_pad_pwrite_args), SY_NOLOCK | 0,
+           sys_pad_pwrite },                   /* 174 = pad_pwrite */
        { 0, 0, 0,
            sys_nosys },                        /* 175 = unimplemented ntp_gettime */
        { 0, 0, 0,
@@ -431,16 +431,16 @@ const struct sysent sysent[] = {
            sys_setrlimit },                    /* 195 = setrlimit */
        { 0, 0, 0,
            sys_nosys },                        /* 196 = obsolete ogetdirentries48 */
-       { 7, s(struct sys_mmap_args), 0,
-           sys_mmap },                         /* 197 = mmap */
+       { 7, s(struct sys_pad_mmap_args), 0,
+           sys_pad_mmap },                     /* 197 = pad_mmap */
        { 0, 0, 0,
            sys_nosys },                        /* 198 = __syscall (indir) */
-       { 4, s(struct sys_lseek_args), SY_NOLOCK | 0,
-           sys_lseek },                        /* 199 = lseek */
-       { 3, s(struct sys_truncate_args), 0,
-           sys_truncate },                     /* 200 = truncate */
-       { 3, s(struct sys_ftruncate_args), 0,
-           sys_ftruncate },                    /* 201 = ftruncate */
+       { 4, s(struct sys_pad_lseek_args), SY_NOLOCK | 0,
+           sys_pad_lseek },                    /* 199 = pad_lseek */
+       { 3, s(struct sys_pad_truncate_args), 0,
+           sys_pad_truncate },                 /* 200 = pad_truncate */
+       { 3, s(struct sys_pad_ftruncate_args), 0,
+           sys_pad_ftruncate },                /* 201 = pad_ftruncate */
        { 6, s(struct sys_sysctl_args), 0,
            sys_sysctl },                       /* 202 = sysctl */
        { 2, s(struct sys_mlock_args), 0,
@@ -598,10 +598,10 @@ const struct sysent sysent[] = {
            sys_nosys },                        /* 265 = unimplemented */
        { 0, 0, 0,
            sys_nosys },                        /* 266 = unimplemented */
-       { 5, s(struct sys_preadv_args), SY_NOLOCK | 0,
-           sys_preadv },                       /* 267 = preadv */
-       { 5, s(struct sys_pwritev_args), SY_NOLOCK | 0,
-           sys_pwritev },                      /* 268 = pwritev */
+       { 5, s(struct sys_pad_preadv_args), SY_NOLOCK | 0,
+           sys_pad_preadv },                   /* 267 = pad_preadv */
+       { 5, s(struct sys_pad_pwritev_args), SY_NOLOCK | 0,
+           sys_pad_pwritev },                  /* 268 = pad_pwritev */
        { 0, 0, SY_NOLOCK | 0,
            sys_kqueue },                       /* 269 = kqueue */
        { 0, 0, 0,
@@ -636,8 +636,8 @@ const struct sysent sysent[] = {
            sys_setresgid },                    /* 284 = setresgid */
        { 0, 0, 0,
            sys_nosys },                        /* 285 = obsolete sys_omquery */
-       { 7, s(struct sys_mquery_args), 0,
-           sys_mquery },                       /* 286 = mquery */
+       { 7, s(struct sys_pad_mquery_args), 0,
+           sys_pad_mquery },                   /* 286 = pad_mquery */
        { 1, s(struct sys_closefrom_args), SY_NOLOCK | 0,
            sys_closefrom },                    /* 287 = closefrom */
        { 2, s(struct sys_sigaltstack_args), 0,

diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 49793eb..d92df40 100644 (file)
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*     $OpenBSD: syscalls.c,v 1.231 2021/12/07 22:17:02 guenther Exp $ */
+/*     $OpenBSD: syscalls.c,v 1.232 2021/12/23 18:50:59 guenther Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.220 2021/11/29 16:30:30 mvs Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.221 2021/12/23 18:50:31 guenther Exp 
  */
 
 const char *const syscallnames[] = {
@@ -65,7 +65,7 @@ const char *const syscallnames[] = {
        "sigaction",                    /* 46 = sigaction */
        "getgid",                       /* 47 = getgid */
        "sigprocmask",                  /* 48 = sigprocmask */
-       "#49 (obsolete ogetlogin)",             /* 49 = obsolete ogetlogin */
+       "mmap",                 /* 49 = mmap */
        "setlogin",                     /* 50 = setlogin */
 #ifdef ACCOUNTING
        "acct",                 /* 51 = acct */
@@ -98,7 +98,7 @@ const char *const syscallnames[] = {
        "madvise",                      /* 75 = madvise */
        "utimes",                       /* 76 = utimes */
        "futimes",                      /* 77 = futimes */
-       "#78 (unimplemented mincore)",          /* 78 = unimplemented mincore */
+       "mquery",                       /* 78 = mquery */
        "getgroups",                    /* 79 = getgroups */
        "setgroups",                    /* 80 = setgroups */
        "getpgrp",                      /* 81 = getpgrp */
@@ -190,15 +190,15 @@ const char *const syscallnames[] = {
        "#163 (obsolete osetdomainname)",               /* 163 = obsolete osetdomainname */
        "__tmpfd",                      /* 164 = __tmpfd */
        "sysarch",                      /* 165 = sysarch */
-       "#166 (unimplemented)",         /* 166 = unimplemented */
-       "#167 (unimplemented)",         /* 167 = unimplemented */
-       "#168 (unimplemented)",         /* 168 = unimplemented */
-       "#169 (obsolete semsys10)",             /* 169 = obsolete semsys10 */
-       "#170 (obsolete msgsys10)",             /* 170 = obsolete msgsys10 */
-       "#171 (obsolete shmsys10)",             /* 171 = obsolete shmsys10 */
-       "#172 (unimplemented)",         /* 172 = unimplemented */
-       "pread",                        /* 173 = pread */
-       "pwrite",                       /* 174 = pwrite */
+       "lseek",                        /* 166 = lseek */
+       "truncate",                     /* 167 = truncate */
+       "ftruncate",                    /* 168 = ftruncate */
+       "pread",                        /* 169 = pread */
+       "pwrite",                       /* 170 = pwrite */
+       "preadv",                       /* 171 = preadv */
+       "pwritev",                      /* 172 = pwritev */
+       "pad_pread",                    /* 173 = pad_pread */
+       "pad_pwrite",                   /* 174 = pad_pwrite */
        "#175 (unimplemented ntp_gettime)",             /* 175 = unimplemented ntp_gettime */
        "#176 (unimplemented ntp_adjtime)",             /* 176 = unimplemented ntp_adjtime */
        "#177 (unimplemented)",         /* 177 = unimplemented */
@@ -221,11 +221,11 @@ const char *const syscallnames[] = {
        "getrlimit",                    /* 194 = getrlimit */
        "setrlimit",                    /* 195 = setrlimit */
        "#196 (obsolete ogetdirentries48)",             /* 196 = obsolete ogetdirentries48 */
-       "mmap",                 /* 197 = mmap */
+       "pad_mmap",                     /* 197 = pad_mmap */
        "__syscall",                    /* 198 = __syscall */
-       "lseek",                        /* 199 = lseek */
-       "truncate",                     /* 200 = truncate */
-       "ftruncate",                    /* 201 = ftruncate */
+       "pad_lseek",                    /* 199 = pad_lseek */
+       "pad_truncate",                 /* 200 = pad_truncate */
+       "pad_ftruncate",                        /* 201 = pad_ftruncate */
        "sysctl",                       /* 202 = sysctl */
        "mlock",                        /* 203 = mlock */
        "munlock",                      /* 204 = munlock */
@@ -309,8 +309,8 @@ const char *const syscallnames[] = {
        "fhopen",                       /* 264 = fhopen */
        "#265 (unimplemented)",         /* 265 = unimplemented */
        "#266 (unimplemented)",         /* 266 = unimplemented */
-       "preadv",                       /* 267 = preadv */
-       "pwritev",                      /* 268 = pwritev */
+       "pad_preadv",                   /* 267 = pad_preadv */
+       "pad_pwritev",                  /* 268 = pad_pwritev */
        "kqueue",                       /* 269 = kqueue */
        "#270 (obsolete t32_kevent)",           /* 270 = obsolete t32_kevent */
        "mlockall",                     /* 271 = mlockall */
@@ -328,7 +328,7 @@ const char *const syscallnames[] = {
        "getresgid",                    /* 283 = getresgid */
        "setresgid",                    /* 284 = setresgid */
        "#285 (obsolete sys_omquery)",          /* 285 = obsolete sys_omquery */
-       "mquery",                       /* 286 = mquery */
+       "pad_mquery",                   /* 286 = pad_mquery */
        "closefrom",                    /* 287 = closefrom */
        "sigaltstack",                  /* 288 = sigaltstack */
 #ifdef SYSVSHM

diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 44eed79..c528d83 100644 (file)
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*     $OpenBSD: syscall.h,v 1.229 2021/11/29 16:31:43 mvs Exp $       */
+/*     $OpenBSD: syscall.h,v 1.230 2021/12/23 18:50:59 guenther Exp $  */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.220 2021/11/29 16:30:30 mvs Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.221 2021/12/23 18:50:31 guenther Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -154,7 +154,9 @@
 /* syscall: "sigprocmask" ret: "int" args: "int" "sigset_t" */
 #define        SYS_sigprocmask 48
 
-                               /* 49 is obsolete ogetlogin */
+/* syscall: "mmap" ret: "void *" args: "void *" "size_t" "int" "int" "int" "off_t" */
+#define        SYS_mmap        49
+
 /* syscall: "setlogin" ret: "int" args: "const char *" */
 #define        SYS_setlogin    50
 
@@ -239,6 +241,9 @@
 /* syscall: "futimes" ret: "int" args: "int" "const struct timeval *" */
 #define        SYS_futimes     77
 
+/* syscall: "mquery" ret: "void *" args: "void *" "size_t" "int" "int" "int" "off_t" */
+#define        SYS_mquery      78
+
 /* syscall: "getgroups" ret: "int" args: "int" "gid_t *" */
 #define        SYS_getgroups   79
 
@@ -441,14 +446,32 @@
 /* syscall: "sysarch" ret: "int" args: "int" "void *" */
 #define        SYS_sysarch     165
 
-                               /* 169 is obsolete semsys10 */
-                               /* 170 is obsolete msgsys10 */
-                               /* 171 is obsolete shmsys10 */
-/* syscall: "pread" ret: "ssize_t" args: "int" "void *" "size_t" "int" "off_t" */
-#define        SYS_pread       173
+/* syscall: "lseek" ret: "off_t" args: "int" "off_t" "int" */
+#define        SYS_lseek       166
+
+/* syscall: "truncate" ret: "int" args: "const char *" "off_t" */
+#define        SYS_truncate    167
+
+/* syscall: "ftruncate" ret: "int" args: "int" "off_t" */
+#define        SYS_ftruncate   168
+
+/* syscall: "pread" ret: "ssize_t" args: "int" "void *" "size_t" "off_t" */
+#define        SYS_pread       169
+
+/* syscall: "pwrite" ret: "ssize_t" args: "int" "const void *" "size_t" "off_t" */
+#define        SYS_pwrite      170
+
+/* syscall: "preadv" ret: "ssize_t" args: "int" "const struct iovec *" "int" "off_t" */
+#define        SYS_preadv      171
+
+/* syscall: "pwritev" ret: "ssize_t" args: "int" "const struct iovec *" "int" "off_t" */
+#define        SYS_pwritev     172
+
+/* syscall: "pad_pread" ret: "ssize_t" args: "int" "void *" "size_t" "int" "off_t" */
+#define        SYS_pad_pread   173
 
-/* syscall: "pwrite" ret: "ssize_t" args: "int" "const void *" "size_t" "int" "off_t" */
-#define        SYS_pwrite      174
+/* syscall: "pad_pwrite" ret: "ssize_t" args: "int" "const void *" "size_t" "int" "off_t" */
+#define        SYS_pad_pwrite  174
 
 /* syscall: "setgid" ret: "int" args: "gid_t" */
 #define        SYS_setgid      181
@@ -482,20 +505,20 @@
 #define        SYS_setrlimit   195
 
                                /* 196 is obsolete ogetdirentries48 */
-/* syscall: "mmap" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" "off_t" */
-#define        SYS_mmap        197
+/* 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
 
-/* syscall: "lseek" ret: "off_t" args: "int" "int" "off_t" "int" */
-#define        SYS_lseek       199
+/* syscall: "pad_lseek" ret: "off_t" args: "int" "int" "off_t" "int" */
+#define        SYS_pad_lseek   199
 
-/* syscall: "truncate" ret: "int" args: "const char *" "int" "off_t" */
-#define        SYS_truncate    200
+/* syscall: "pad_truncate" ret: "int" args: "const char *" "int" "off_t" */
+#define        SYS_pad_truncate        200
 
-/* syscall: "ftruncate" ret: "int" args: "int" "int" "off_t" */
-#define        SYS_ftruncate   201
+/* syscall: "pad_ftruncate" ret: "int" args: "int" "int" "off_t" */
+#define        SYS_pad_ftruncate       201
 
 /* syscall: "sysctl" ret: "int" args: "const int *" "u_int" "void *" "size_t *" "void *" "size_t" */
 #define        SYS_sysctl      202
@@ -567,11 +590,11 @@
 /* syscall: "fhopen" ret: "int" args: "const fhandle_t *" "int" */
 #define        SYS_fhopen      264
 
-/* syscall: "preadv" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
-#define        SYS_preadv      267
+/* syscall: "pad_preadv" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
+#define        SYS_pad_preadv  267
 
-/* syscall: "pwritev" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
-#define        SYS_pwritev     268
+/* syscall: "pad_pwritev" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
+#define        SYS_pad_pwritev 268
 
 /* syscall: "kqueue" ret: "int" args: */
 #define        SYS_kqueue      269
@@ -596,8 +619,8 @@
 #define        SYS_setresgid   284
 
                                /* 285 is obsolete sys_omquery */
-/* syscall: "mquery" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" "off_t" */
-#define        SYS_mquery      286
+/* syscall: "pad_mquery" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" "off_t" */
+#define        SYS_pad_mquery  286
 
 /* syscall: "closefrom" ret: "int" args: "int" */
 #define        SYS_closefrom   287

diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 7882826..53b1520 100644 (file)
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*     $OpenBSD: syscallargs.h,v 1.232 2021/11/29 16:31:43 mvs Exp $   */
+/*     $OpenBSD: syscallargs.h,v 1.233 2021/12/23 18:50:59 guenther Exp $      */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.220 2021/11/29 16:30:30 mvs Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.221 2021/12/23 18:50:31 guenther Exp 
  */
 
 #ifdef syscallarg
@@ -237,6 +237,15 @@ struct sys_sigprocmask_args {
        syscallarg(sigset_t) mask;
 };
 
+struct sys_mmap_args {
+       syscallarg(void *) addr;
+       syscallarg(size_t) len;
+       syscallarg(int) prot;
+       syscallarg(int) flags;
+       syscallarg(int) fd;
+       syscallarg(off_t) pos;
+};
+
 struct sys_setlogin_args {
        syscallarg(const char *) namebuf;
 };
@@ -375,6 +384,15 @@ struct sys_futimes_args {
        syscallarg(const struct timeval *) tptr;
 };
 
+struct sys_mquery_args {
+       syscallarg(void *) addr;
+       syscallarg(size_t) len;
+       syscallarg(int) prot;
+       syscallarg(int) flags;
+       syscallarg(int) fd;
+       syscallarg(off_t) pos;
+};
+
 struct sys_getgroups_args {
        syscallarg(int) gidsetsize;
        syscallarg(gid_t *) gidset;
@@ -710,15 +728,59 @@ struct sys_sysarch_args {
        syscallarg(void *) parms;
 };
 
+struct sys_lseek_args {
+       syscallarg(int) fd;
+       syscallarg(off_t) offset;
+       syscallarg(int) whence;
+};
+
+struct sys_truncate_args {
+       syscallarg(const char *) path;
+       syscallarg(off_t) length;
+};
+
+struct sys_ftruncate_args {
+       syscallarg(int) fd;
+       syscallarg(off_t) length;
+};
+
 struct sys_pread_args {
        syscallarg(int) fd;
        syscallarg(void *) buf;
        syscallarg(size_t) nbyte;
-       syscallarg(int) pad;
        syscallarg(off_t) offset;
 };
 
 struct sys_pwrite_args {
+       syscallarg(int) fd;
+       syscallarg(const void *) buf;
+       syscallarg(size_t) nbyte;
+       syscallarg(off_t) offset;
+};
+
+struct sys_preadv_args {
+       syscallarg(int) fd;
+       syscallarg(const struct iovec *) iovp;
+       syscallarg(int) iovcnt;
+       syscallarg(off_t) offset;
+};
+
+struct sys_pwritev_args {
+       syscallarg(int) fd;
+       syscallarg(const struct iovec *) iovp;
+       syscallarg(int) iovcnt;
+       syscallarg(off_t) offset;
+};
+
+struct sys_pad_pread_args {
+       syscallarg(int) fd;
+       syscallarg(void *) buf;
+       syscallarg(size_t) nbyte;
+       syscallarg(int) pad;
+       syscallarg(off_t) offset;
+};
+
+struct sys_pad_pwrite_args {
        syscallarg(int) fd;
        syscallarg(const void *) buf;
        syscallarg(size_t) nbyte;
@@ -764,7 +826,7 @@ struct sys_setrlimit_args {
        syscallarg(const struct rlimit *) rlp;
 };
 
-struct sys_mmap_args {
+struct sys_pad_mmap_args {
        syscallarg(void *) addr;
        syscallarg(size_t) len;
        syscallarg(int) prot;
@@ -774,20 +836,20 @@ struct sys_mmap_args {
        syscallarg(off_t) pos;
 };
 
-struct sys_lseek_args {
+struct sys_pad_lseek_args {
        syscallarg(int) fd;
        syscallarg(int) pad;
        syscallarg(off_t) offset;
        syscallarg(int) whence;
 };
 
-struct sys_truncate_args {
+struct sys_pad_truncate_args {
        syscallarg(const char *) path;
        syscallarg(int) pad;
        syscallarg(off_t) length;
 };
 
-struct sys_ftruncate_args {
+struct sys_pad_ftruncate_args {
        syscallarg(int) fd;
        syscallarg(int) pad;
        syscallarg(off_t) length;
@@ -895,7 +957,7 @@ struct sys_fhopen_args {
        syscallarg(int) flags;
 };
 
-struct sys_preadv_args {
+struct sys_pad_preadv_args {
        syscallarg(int) fd;
        syscallarg(const struct iovec *) iovp;
        syscallarg(int) iovcnt;
@@ -903,7 +965,7 @@ struct sys_preadv_args {
        syscallarg(off_t) offset;
 };
 
-struct sys_pwritev_args {
+struct sys_pad_pwritev_args {
        syscallarg(int) fd;
        syscallarg(const struct iovec *) iovp;
        syscallarg(int) iovcnt;
@@ -939,7 +1001,7 @@ struct sys_setresgid_args {
        syscallarg(gid_t) sgid;
 };
 
-struct sys_mquery_args {
+struct sys_pad_mquery_args {
        syscallarg(void *) addr;
        syscallarg(size_t) len;
        syscallarg(int) prot;
@@ -1167,6 +1229,7 @@ int       sys_ktrace(struct proc *, void *, register_t *);
 int    sys_sigaction(struct proc *, void *, register_t *);
 int    sys_getgid(struct proc *, void *, register_t *);
 int    sys_sigprocmask(struct proc *, void *, register_t *);
+int    sys_mmap(struct proc *, void *, register_t *);
 int    sys_setlogin(struct proc *, void *, register_t *);
 #ifdef ACCOUNTING
 int    sys_acct(struct proc *, void *, register_t *);
@@ -1198,6 +1261,7 @@ int       sys_mprotect(struct proc *, void *, register_t *);
 int    sys_madvise(struct proc *, void *, register_t *);
 int    sys_utimes(struct proc *, void *, register_t *);
 int    sys_futimes(struct proc *, void *, register_t *);
+int    sys_mquery(struct proc *, void *, register_t *);
 int    sys_getgroups(struct proc *, void *, register_t *);
 int    sys_setgroups(struct proc *, void *, register_t *);
 int    sys_getpgrp(struct proc *, void *, register_t *);
@@ -1262,8 +1326,15 @@ int      sys_nfssvc(struct proc *, void *, register_t *);
 int    sys_getfh(struct proc *, void *, register_t *);
 int    sys___tmpfd(struct proc *, void *, register_t *);
 int    sys_sysarch(struct proc *, void *, register_t *);
+int    sys_lseek(struct proc *, void *, register_t *);
+int    sys_truncate(struct proc *, void *, register_t *);
+int    sys_ftruncate(struct proc *, void *, register_t *);
 int    sys_pread(struct proc *, void *, register_t *);
 int    sys_pwrite(struct proc *, void *, register_t *);
+int    sys_preadv(struct proc *, void *, register_t *);
+int    sys_pwritev(struct proc *, void *, register_t *);
+int    sys_pad_pread(struct proc *, void *, register_t *);
+int    sys_pad_pwrite(struct proc *, void *, register_t *);
 int    sys_setgid(struct proc *, void *, register_t *);
 int    sys_setegid(struct proc *, void *, register_t *);
 int    sys_seteuid(struct proc *, void *, register_t *);
@@ -1272,10 +1343,10 @@ int     sys_fpathconf(struct proc *, void *, register_t *);
 int    sys_swapctl(struct proc *, void *, register_t *);
 int    sys_getrlimit(struct proc *, void *, register_t *);
 int    sys_setrlimit(struct proc *, void *, register_t *);
-int    sys_mmap(struct proc *, void *, register_t *);
-int    sys_lseek(struct proc *, void *, register_t *);
-int    sys_truncate(struct proc *, void *, register_t *);
-int    sys_ftruncate(struct proc *, void *, register_t *);
+int    sys_pad_mmap(struct proc *, void *, register_t *);
+int    sys_pad_lseek(struct proc *, void *, register_t *);
+int    sys_pad_truncate(struct proc *, void *, register_t *);
+int    sys_pad_ftruncate(struct proc *, void *, register_t *);
 int    sys_sysctl(struct proc *, void *, register_t *);
 int    sys_mlock(struct proc *, void *, register_t *);
 int    sys_munlock(struct proc *, void *, register_t *);
@@ -1304,8 +1375,8 @@ int       sys_getsid(struct proc *, void *, register_t *);
 int    sys_msync(struct proc *, void *, register_t *);
 int    sys_pipe(struct proc *, void *, register_t *);
 int    sys_fhopen(struct proc *, void *, register_t *);
-int    sys_preadv(struct proc *, void *, register_t *);
-int    sys_pwritev(struct proc *, void *, register_t *);
+int    sys_pad_preadv(struct proc *, void *, register_t *);
+int    sys_pad_pwritev(struct proc *, void *, register_t *);
 int    sys_kqueue(struct proc *, void *, register_t *);
 int    sys_mlockall(struct proc *, void *, register_t *);
 int    sys_munlockall(struct proc *, void *, register_t *);
@@ -1313,7 +1384,7 @@ int       sys_getresuid(struct proc *, void *, register_t *);
 int    sys_setresuid(struct proc *, void *, register_t *);
 int    sys_getresgid(struct proc *, void *, register_t *);
 int    sys_setresgid(struct proc *, void *, register_t *);
-int    sys_mquery(struct proc *, void *, register_t *);
+int    sys_pad_mquery(struct proc *, void *, register_t *);
 int    sys_closefrom(struct proc *, void *, register_t *);
 int    sys_sigaltstack(struct proc *, void *, register_t *);
 #ifdef SYSVSHM